diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 4eab6b303f..2c0c6071bf 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -137,9 +137,9 @@ function display_setup_form( $error = null ) {
 			</th>
 			<td>
 				<div class="">
-					<?php $initial_password = wp_generate_password( 18 ); ?>
+					<?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
 					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
-					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
 						<span class="dashicons dashicons-hidden"></span>
 						<span class="text"><?php _e( 'Hide' ); ?></span>
 					</button>
diff --git a/src/wp-admin/js/user-profile.js b/src/wp-admin/js/user-profile.js
index 799ee97276..bb80a3274f 100644
--- a/src/wp-admin/js/user-profile.js
+++ b/src/wp-admin/js/user-profile.js
@@ -12,6 +12,7 @@
 		$weakRow,
 		$weakCheckbox,
 
+		$toggleButton,
 		$submitButtons,
 		$submitButton,
 		currentPass;
@@ -22,7 +23,11 @@
 		} else {
 			$pass1.val( $pass1.data( 'pw' ) );
 			$pass1.trigger( 'pwupdate' );
-			$pass1Wrap.addClass( 'show-password' );
+			if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
+				$pass1Wrap.addClass( 'show-password' );
+			} else {
+				$toggleButton.trigger( 'click' );
+			}
 		}
 	}
 
@@ -82,11 +87,11 @@
 	}
 
 	function bindToggleButton() {
-		var toggleButton = $pass1Row.find('.wp-hide-pw');
-		toggleButton.show().on( 'click', function () {
-			if ( 1 === parseInt( toggleButton.data( 'toggle' ), 10 ) ) {
+		$toggleButton = $pass1Row.find('.wp-hide-pw');
+		$toggleButton.show().on( 'click', function () {
+			if ( 1 === parseInt( $toggleButton.data( 'toggle' ), 10 ) ) {
 				$pass1Wrap.addClass( 'show-password' );
-				toggleButton
+				$toggleButton
 					.data( 'toggle', 0 )
 					.attr({
 						'aria-label': userProfileL10n.ariaHide
@@ -105,7 +110,7 @@
 				}
 			} else {
 				$pass1Wrap.removeClass( 'show-password' );
-				toggleButton
+				$toggleButton
 					.data( 'toggle', 1 )
 					.attr({
 						'aria-label': userProfileL10n.ariaShow