Ticket #33778: 33778.2.patch

user-profile.js

@@ -57 +57 @@
                         } );
 
                 $pass1.after( $pass1Text );
-
+                
                 if ( 1 === parseInt( $pass1.data( 'reveal' ), 10 ) ) {
                         generatePassword();
                 }
@@ -104 +104 @@
                                         .find( '.dashicons' )
                                                 .removeClass('dashicons-visibility')
                                                 .addClass('dashicons-hidden');
-
+                                        
                                 $pass1Text.focus();
+                                
+                                $pass1Row.find('th').children('label').attr({'for':'pass1-text'});
 
                                 if ( ! _.isUndefined( $pass1Text[0].setSelectionRange ) ) {
                                         $pass1Text[0].setSelectionRange( 0, 100 );
@@ -125 +127 @@
                                                 .addClass('dashicons-visibility');
 
                                 $pass1.focus();
+                                
+                                $pass1Row.find('th').children('label').attr({'for':'pass1'});
 
                                 if ( ! _.isUndefined( $pass1[0].setSelectionRange ) ) {
                                         $pass1[0].setSelectionRange( 0, 100 );
@@ -177 +181 @@
                 $passwordWrapper = $pass1Row.find('.wp-pwd').hide();
 
                 bindToggleButton();
+                
+                if( $pass1Row.find( 'button.wp-generate-pw' ).length )
+                        $pass1Row.find('th').children('label').attr({'for':'wp-generate-pw'});
+                else
+                        $pass1Row.find('th').children('label').attr({'for':'pass1-text'});
 
                 $generateButton = $pass1Row.find( 'button.wp-generate-pw' ).show();
                 $generateButton.on( 'click', function () {