diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index ef6d9cc79e..cc001b251a 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1629,15 +1629,15 @@ function add_magic_quotes($array) {
 }
 
 function wp_setcookie($username, $password, $already_md5 = false, $home = '', $siteurl = '') {
-	if ( ! $already_md5)
-		$password = md5(md5($password)); // Double hash the password in the cookie.
+	if ( !$already_md5 )
+		$password = md5( md5($password) ); // Double hash the password in the cookie.
 
-	if (empty($home))
+	if ( empty($home) )
 		$cookiepath = COOKIEPATH;
 	else
 		$cookiepath = preg_replace('|https?://[^/]+|i', '', $home . '/' );
 
-	if (empty($siteurl)) {
+	if ( empty($siteurl) ) {
 		$sitecookiepath = SITECOOKIEPATH;
 		$cookiehash = COOKIEHASH;
 	} else {
diff --git a/wp-login.php b/wp-login.php
index d9c190e197..a521089b09 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -9,12 +9,13 @@ header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 header('Cache-Control: no-cache, must-revalidate');
 header('Pragma: no-cache');
 
-// If someone has moved WordPress let's try to detect it
-if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
-	$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
-
-if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
-	update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
+if ( defined('RELOCATE') ) { // Move flag is set
+	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
+		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+	
+	if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
+		update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
+}
 
 switch($action) {