diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css
index 23283235d7..5da174cadc 100644
--- a/src/wp-admin/css/login.css
+++ b/src/wp-admin/css/login.css
@@ -73,6 +73,25 @@ p {
 	padding: 0;
 }
 
+.login .password-input-wrapper {
+    display: table;
+}
+
+.login .input.password-input {
+    display: table-cell;
+    margin: 0;
+}
+
+.login .pw-weak {
+    margin-bottom: 15px;
+}
+
+.login .button.button-secondary {
+    display: table-cell;
+    border-radius: 0;
+    vertical-align: middle;
+}
+
 .login form {
 	margin-top: 20px;
 	margin-left: 0;
diff --git a/src/wp-admin/js/user-profile.js b/src/wp-admin/js/user-profile.js
index ca99584215..e95a42844e 100644
--- a/src/wp-admin/js/user-profile.js
+++ b/src/wp-admin/js/user-profile.js
@@ -161,7 +161,7 @@
 		// hide this
 		$('.user-pass2-wrap').hide();
 
-		$submitButton = $( '#submit' ).on( 'click', function () {
+		$submitButton = $( '#submit, #wp-submit' ).on( 'click', function () {
 			updateLock = false;
 		});
 
@@ -314,7 +314,7 @@
 
 		if ( passStrength.className ) {
 			$pass1.add( $pass1Text ).addClass( passStrength.className );
-			if ( 'short' === passStrength.className || 'bad' === passStrength.className ) {
+			if ( $( passStrength ).is( '.short, .bad' ) ) {
 				if ( ! $weakCheckbox.prop( 'checked' ) ) {
 					$submitButtons.prop( 'disabled', true );
 				}
diff --git a/src/wp-login.php b/src/wp-login.php
index 507a122af5..4670b171b3 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -644,11 +644,20 @@ case 'rp' :
 		</p>
 
 		<div class="wp-pwd">
-			<span class="password-input-wrapper">
-				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
-			</span>
+			<div class="password-input-wrapper">
+				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input password-input" size="24" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+				<span class="button button-secondary wp-hide-pw hide-if-no-js">
+					<span class="dashicons dashicons-hidden"></span>
+				</span>
+			</div>
 			<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
 		</div>
+		<div class="pw-weak">
+			<label>
+				<input type="checkbox" name="pw_weak" class="pw-checkbox" />
+				<?php _e( 'Confirm use of weak password' ); ?>
+			</label>
+		</div>
 	</div>
 
 	<p class="user-pass2-wrap">