diff --git a/wp-login.php b/wp-login.php
index 5623c8c5cb..fbb563fc25 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -45,8 +45,8 @@ header('Cache-Control: no-cache, must-revalidate');
 header('Pragma: no-cache');
 
 // If someone has moved WordPress let's try to detect it
-if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']) != get_settings('siteurl') )
-	update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']) );
+if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']) != get_settings('siteurl') )
+	update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']) );
 
 switch($action) {