diff --git a/wp-pass.php b/wp-pass.php
index 8cf8e433a..f560d36a1 100644
--- a/wp-pass.php
+++ b/wp-pass.php
@@ -1,11 +1,12 @@
 <?php
-/*
-  This is just a very simple script to set a cookie with a posted password and redirect back from whence the browser came.
-  It doesn't need to connect to the DB, or do anything fancy at all. Yum.
-  -- Matt
-*/
 require(dirname(__FILE__) . '/wp-config.php');
-setcookie('wp-postpass_'.$cookiehash, stripslashes($_POST['post_password']), time()+60*60*24*30);
+
+if ( get_magic_quotes_gpc() )
+	$_POST['post_password'] = stripslashes($_POST['post_password']);
+
+// 10 days
+setcookie('wp-postpass_' . COOKIEHASH, $_POST['post_password'], time() + 864000, COOKIEPATH);
+
 header('Location: ' . $_SERVER['HTTP_REFERER']);
 
 ?>
\ No newline at end of file