diff --git a/src/wp-admin/js/user-profile.js b/src/wp-admin/js/user-profile.js
index 94a75b04e5..771981c190 100644
--- a/src/wp-admin/js/user-profile.js
+++ b/src/wp-admin/js/user-profile.js
@@ -109,8 +109,10 @@
 		 * pass2 field to the pass1 field.
 		 */
 		pw_field2.on( 'input propertychange', function() {
-			pw_field.val( pw_field2.val() );
-			pw_field.trigger( 'propertychange' );
+			if ( pw_field2.val().length > 0 ) {
+				pw_field.val( pw_field2.val() );
+				pw_field.trigger( 'propertychange' );
+			}
 		} );
 
 		pw_new.on( 'click', 'button.wp-generate-pw', function(){