diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index 3b5d4d573c..6c824ece31 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -454,7 +454,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 					"FORUM_LOCATION" => $location,
 					"IP_ADDRESS" => $reg_ip, 
 
-					"U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$reg_ip", 
+					"U_WHOIS_IP" => "http://www.geektools.com/cgi-bin/proxy.cgi?query=$reg_ip&targetnic=auto", 
 					"U_USER_PROFILE" => append_sid("admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
 					"U_FORUM_LOCATION" => append_sid($location_url))
 				);
@@ -546,7 +546,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 				"FORUM_LOCATION" => $location,
 				"IP_ADDRESS" => $guest_ip, 
 
-				"U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$guest_ip", 
+				"U_WHOIS_IP" => "http://www.geektools.com/cgi-bin/proxy.cgi?query=$guest_ip&targetnic=auto", 
 				"U_FORUM_LOCATION" => append_sid($location_url))
 			);
 		}