diff --git a/core/js/setup.js b/core/js/setup.js
index 736bedac75..01b8c13039 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -2,20 +2,28 @@ $(document).ready(function() {
 	$('#selectDbType').buttonset();
 	$('#datadirField').hide(250);
 	if($('#hasSQLite').val()=='true'){
-		$('#databaseField').hide(250);
-		$('#use_other_db').slideUp(250);
+		$('#databaseField').hide();
+		$('#use_other_db').slideUp();
+		$('#dbhost').hide(250);
+		$('#dbhostlabel').hide(250);
 	}
 
 	$('#sqlite').click(function() {
 		$('#use_other_db').slideUp(250);
+		$('#dbhost').hide(250);
+		$('#dbhostlabel').hide(250);
 	});
 
 	$('#mysql').click(function() {
 		$('#use_other_db').slideDown(250);
+		$('#dbhost').show(250);
+		$('#dbhostlabel').show(250);
 	});
 	
 	$('#pgsql').click(function() {
 		$('#use_other_db').slideDown(250);
+		$('#dbhost').show(250);
+		$('#dbhostlabel').show(250);
 	});
 
 	$('#showAdvanced').click(function() {
diff --git a/core/templates/installation.php b/core/templates/installation.php
index ba0322cc05..09f9ad8c35 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -64,8 +64,6 @@
 			<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" placeholder="<?php echo $l->t( 'Database user' ); ?>" autocomplete="off" />
 			<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" placeholder="<?php echo $l->t( 'Database password' ); ?>" />
 			<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" placeholder="<?php echo $l->t( 'Database name' ); ?>" autocomplete="off" />
-			
-			
 		</div>
 		<?php endif; ?>