diff --git a/main.inc.php b/main.inc.php
index be0b6bfcfd77be05f921a560b14faf2730110117..b980d87ed93f3ec2f81a09af97c21c67ba0d5f0a 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -199,8 +199,10 @@
     define('TIMEZONE_TABLE',TABLE_PREFIX.'timezone');
 
     #Global overwrite
-    if($_SERVER['HTTP_X_FORWARDED_FOR']) //Can contain multiple IPs - use the last one.
-        $_SERVER['REMOTE_ADDR'] =  array_pop(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']));
+    if (isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+        // Take the left-most item for X-Forwarded-For
+        $_SERVER['REMOTE_ADDR'] = array_pop(
+            explode(',', trim($_SERVER['HTTP_X_FORWARDED_FOR'])));
 
     #Connect to the DB && get configuration from database
     $ferror=null;