diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index a19691bef..3b6d0c0db 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -564,7 +564,7 @@ function post_password_required( $post = null ) {
 	if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
 		return true;
 
-	if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
+	if ( stripslashes( $_COOKIE['wp-postpass_' . COOKIEHASH] ) != $post->post_password )
 		return true;
 
 	return false;
diff --git a/wp-pass.php b/wp-pass.php
index c0c0c42a3..556deab9c 100644
--- a/wp-pass.php
+++ b/wp-pass.php
@@ -9,11 +9,8 @@
 /** Make sure that the WordPress bootstrap has run before continuing. */
 require( dirname(__FILE__) . '/wp-load.php');
 
-if ( get_magic_quotes_gpc() )
-	$_POST['post_password'] = stripslashes($_POST['post_password']);
-
 // 10 days
-setcookie('wp-postpass_' . COOKIEHASH, $_POST['post_password'], time() + 864000, COOKIEPATH);
+setcookie('wp-postpass_' . COOKIEHASH, stripslashes( $_POST['post_password'] ), time() + 864000, COOKIEPATH);
 
 wp_safe_redirect(wp_get_referer());
 exit;