diff --git a/core/css/styles.css b/core/css/styles.css
index efc49e02a1..60b325111f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -490,8 +490,9 @@ label.infield {
 }
 #personal-show + label {
 	height: 14px;
-	margin-top: 14px;
-	margin-left: -36px;
+	margin-top: -25px;
+	left: 295px;
+	display: block;
 }
 #passwordbutton {
 	margin-left: .5em;
diff --git a/settings/js/personal.js b/settings/js/personal.js
index e2bfcbe3ad..49bd0d6823 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -221,12 +221,14 @@ $(document).ready(function () {
 			$('#passworderror').hide();
 			$("#passwordbutton").attr('disabled', 'disabled');
 			$("#passwordbutton").after("<span class='password-loading icon icon-loading-small-dark password-state'></span>");
+			$(".personal-show-label").hide();
 			// Ajax foo
 			$.post(OC.generateUrl('/settings/personal/changepassword'), post, function (data) {
 				if (data.status === "success") {
 					$(".password-loading").remove();
 					$("#passwordbutton").after("<span class='checkmark icon icon-checkmark password-state'></span>");
 					removeloader();
+					$(".personal-show-label").show();
 					$('#pass1').val('');
 					$('#pass2').val('').change();
 					OC.msg.finishedSaving('#password-error-msg', data);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index bbb47f48ba..b7bb0c8bfc 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -129,7 +129,7 @@ if($_['passwordChangeSupported']) {
 		placeholder="<?php echo $l->t('New password');?>"
 		data-typetoggle="#personal-show"
 		autocomplete="off" autocapitalize="off" autocorrect="off" />
-	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
+	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="personal-show-label"></label>
 	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	<br/>
 </form>