diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css
index 5b019228cf..6c4d7024fb 100644
--- a/src/wp-admin/css/login.css
+++ b/src/wp-admin/css/login.css
@@ -213,12 +213,18 @@ p {
 	font-family: sans-serif;
 }
 
+.login-action-rp input[type="text"] {
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	margin: 0;
+}
+
 .login #pass-strength-result {
-	width: 250px;
 	font-weight: 600;
-	margin: 12px 0 6px;
+	margin: -1px 5px 16px 0;
 	padding: 6px 5px;
 	text-align: center;
+	width: 100%;
 }
 
 .mobile #login {
diff --git a/src/wp-login.php b/src/wp-login.php
index 9f63e7e3f8..7cc6dd515c 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -656,6 +656,7 @@ case 'rp' :
 		<label for="pass1"><?php _e('New password') ?></label><br />
 		<div class="wp-pwd">
 			<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" />
+			<div id="pass-strength-result" class="hide-if-no-js"><?php _e( 'Strength indicator' ); ?></div>
 		</div>
 	</p>
 	<p class="user-pass2-wrap">
@@ -663,7 +664,6 @@ case 'rp' :
 		<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
 	</p>
 
-	<div id="pass-strength-result" class="hide-if-no-js"><?php _e('Strength indicator'); ?></div>
 	<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
 	<br class="clear" />