diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 6280bc5158..bb9119f221 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -377,6 +377,7 @@ if ( $show_password_fields ) :
 <tr id="password">
 	<th><label for="pass1"><?php _e('New Password'); ?></label></th>
 	<td>
+		<input class="hidden" value=" " /><!-- #24364 workaround -->
 		<input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span>
 	</td>
 </tr>
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 14154973b6..33b8196415 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -342,6 +342,7 @@ foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_nam
 	<tr class="form-field form-required">
 		<th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
 		<td>
+			<input class="hidden" value=" " /><!-- #24364 workaround -->
 			<input name="pass1" type="password" id="pass1" autocomplete="off" />
 		</td>
 	</tr>