diff --git a/core/css/styles.css b/core/css/styles.css
index cefab2d49f..961c7fb7f3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -155,6 +155,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 }
 #adminpass-icon, #password-icon { top:1.1em; }
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
+input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
 
 /* Nicely grouping input field sets */
 .grouptop input {
diff --git a/core/js/js.js b/core/js/js.js
index c137f734d9..4a1f8571cc 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -626,7 +626,8 @@ $(document).ready(function(){
 	});
 
 	// 'show password' checkbox
-	$('#password').showPassword();	
+	$('#password').showPassword();
+	$('#adminpass').showPassword();	
 	$('#pass2').showPassword();
 
 	//use infield labels
diff --git a/core/templates/installation.php b/core/templates/installation.php
index f3d232b637..19395b80ef 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -34,13 +34,13 @@
 	<?php endif; ?>
 	<fieldset id="adminaccount">
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
-		<p class="infield grouptop">
-			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
+		<p class="infield grouptop">		
+			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />			
 			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
+			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />	
 		</p>
 		<p class="infield groupbottom">
-			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required data-typetoggle="#show" />
+			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
 			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 			<input type="checkbox" id="show" name="show" />