diff --git a/core/css/styles.css b/core/css/styles.css
index cefab2d49f..dbe8195c08 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -183,15 +183,16 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
 
 /* Show password toggle */
-#show {
-	position:absolute; right:1em; top:.8em; float:right;
-	display:none;
-}
-#show + label {
-	position:absolute!important; height:14px; width:24px; right:1em; top:1.25em!important;
+#show { position:absolute; right:1em; top:.8em; float:right; }
+#show, #personal-show { display:none; }
+#show + label { right:1em; top:1.25em!important; }
+#show:checked + label, #personal-show:checked + label { opacity:.8; }
+#show + label, #personal-show + label { 
+	position:absolute!important; height:14px; width:24px;
 	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; opacity:.3;
 }
-#show:checked + label { opacity:.8; }
+#personal-show + label { margin-top:1em; }
+#passwordbutton { margin-left:2.5em; }
 
 /* Database selector */
 #login form #selectDbType { text-align:center; }
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 398e65c008..6ccb607e63 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -24,8 +24,8 @@ if($_['passwordChangeSupported']) {
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
-		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
-		<input type="checkbox" id="show" name="show" /><label for="show"> <?php echo $l->t('show');?></label>
+		<input type="password" id="pass2" name="personal-password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
+		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	</fieldset>
 </form>