diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5fc96343502..0460db929c9 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -529,9 +529,9 @@ span.indeterminate {
 }
 
 /* PASSWORD */
-.strengthify-wrapper {
+#passwordform .strengthify-wrapper {
 	position: absolute;
-	left: 189px;
+	left: 186px;
 	width: 131px;
 	margin-top: -7px;
 }
diff --git a/settings/js/personal.js b/settings/js/personal.js
index aea2400e999..d270a49f3ad 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -343,7 +343,8 @@ $(document).ready(function () {
 			t('core', 'So-so password'),
 			t('core', 'Good password'),
 			t('core', 'Strong password')
-		]
+		],
+		drawTitles: true,
 	});
 
 	// does the user have a custom avatar? if he does show #removeavatar
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ced76fc3bf6..83a44234b94 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -133,7 +133,6 @@ if($_['passwordChangeSupported']) {
 	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="svg"></label>
 	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	<br/>
-	<div class="strengthify-wrapper"></div>
 </form>
 <?php
 }