diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 06d259e157..1fc316eb6c 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -1232,13 +1232,12 @@ function prepend_attachment($content) {
  */
 function get_the_password_form( $post = 0 ) {
 	$post = get_post( $post );
-	$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
-	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" method="post">
-	<p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
-	<p><label for="' . $label . '">' . __("Password:") . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__("Submit") . '" /></p>
-</form>
+	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
+	<p>' . __( 'This post is password protected. To view it please enter your password below:' ) . '</p>
+	<p><label>' . __( 'Password:' ) . ' <input name="post_password" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__( 'Submit' ) . '" /></p>
+	</form>
 	';
-	return apply_filters('the_password_form', $output);
+	return apply_filters( 'the_password_form', $output );
 }
 
 /**