diff --git a/core/css/styles.scss b/core/css/styles.scss
index d1e3a9f7be3..c7f1c2d633c 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -568,15 +568,16 @@ label.infield {
 	padding-right: 30px;
 }
 
-#personal-show + label {
-	height: 14px;
-	margin-top: -25px;
-	left: 267px;
-	display: block;
+.personal-show-container {
+	position: relative;
+	display: inline-block;
+	margin-right: 6px;
 }
-
-#passwordbutton {
-	margin-left: .5em;
+#personal-show + label {
+	display: block;
+	right: 0;
+	margin-top: -36px;
+    padding: 6px 4px;
 }
 
 /* Database selector */
diff --git a/settings/css/settings.css b/settings/css/settings.css
index fde2b031f23..7f80f647acb 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -848,7 +848,7 @@ span.indeterminate {
 /* PASSWORD */
 #passwordform .strengthify-wrapper {
 	position: absolute;
-	left: 166px;
+	left: 0;
 	width: 130px;
 	margin-top: -6px;
 }
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d3a835c4a16..65ce3751b98 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -186,12 +186,14 @@ if($_['passwordChangeSupported']) {
 	<input type="password" id="pass1" name="oldpassword"
 		placeholder="<?php p($l->t('Current password'));?>"
 		autocomplete="off" autocapitalize="off" autocorrect="off" />
-	<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
-	<input type="password" id="pass2" name="newpassword"
-		placeholder="<?php p($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" class="personal-show-label"></label>
+	<div class="personal-show-container">
+		<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
+		<input type="password" id="pass2" name="newpassword"
+			placeholder="<?php p($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" class="personal-show-label"></label>
+	</div>
 	<input id="passwordbutton" type="submit" value="<?php p($l->t('Change password')); ?>" />
 	<br/>
 </form>