diff --git a/core/templates/installation.php b/core/templates/installation.php
index de7ff8c168..7f2796a4b3 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -165,7 +165,7 @@
 		<p class="infield groupbottom">
 			<label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label>
 			<input type="text" name="dbhost" id="dbhost" placeholder=""
-				value="<?php p(OC_Helper::init_var('dbhost', 'localhost')); ?>" />
+				value="<?php p(OC_Helper::init_var('dbhost')); ?>" />
 		</p>
 	</fieldset>
 
diff --git a/lib/setup.php b/lib/setup.php
index 61ef7d22b1..741a1837cc 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -61,7 +61,7 @@ class OC_Setup {
 				$error[] = $l->t("%s you may not use dots in the database name", array($dbprettyname));
 			}
 			if($dbtype != 'oci' && empty($options['dbhost'])) {
-				$error[] = $l->t("%s set the database host.", array($dbprettyname));
+				$options['dbhost'] = 'localhost';
 			}
 		}