Index: user-edit.php
===================================================================
--- user-edit.php	(revision 34064)
+++ user-edit.php	(working copy)
@@ -450,7 +450,7 @@
 	<th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
 	<td>
 		<input class="hidden" value=" " /><!-- #24364 workaround -->
-		<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
+		<button type="button" id="wp-generate-pw" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
 		<div class="wp-pwd hide-if-js">
 			<span class="password-input-wrapper">
 				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
Index: js/user-profile.js
===================================================================
--- js/user-profile.js	(revision 34064)
+++ js/user-profile.js	(working copy)
@@ -153,7 +153,12 @@
 			$cancelButton;
 
 		$pass1Row = $('.user-pass1-wrap');
-		$pass1Label = $pass1Row.find('th label').attr( 'for', 'pass1-text' );
+		$generateButton = $pass1Row.find( 'button.wp-generate-pw' ); 
+		
+		if( $generateButton.length )			
+			$pass1Label = $pass1Row.find('th label').attr( 'for', 'wp-generate-pw' );
+		else
+			$pass1Label = $pass1Row.find('th label').attr( 'for', 'pass1-text' );
 
 		// hide this
 		$('.user-pass2-wrap').hide();
@@ -223,6 +228,7 @@
 			// Clear password field to prevent update
 			$pass1.val( '' ).trigger( 'pwupdate' );
 			$submitButtons.prop( 'disabled', false );
+			$pass1Row.find('th').children('label').attr({'for':'wp-generate-pw'});
 		} );
 
 		$pass1Row.closest('form').on( 'submit', function () {