diff --git a/apps/users/api.py b/apps/users/api.py
index 05193d03c..2dfd89fba 100644
--- a/apps/users/api.py
+++ b/apps/users/api.py
@@ -128,7 +128,7 @@ class UserAuthApi(APIView):
         user_agent = request.data.get('HTTP_USER_AGENT', '')
 
         if not login_ip:
-            x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR').split()
+            x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')
             if x_forwarded_for:
                 login_ip = x_forwarded_for[0]
             else:
diff --git a/apps/users/utils.py b/apps/users/utils.py
index 68840f955..fd03ad97d 100644
--- a/apps/users/utils.py
+++ b/apps/users/utils.py
@@ -180,6 +180,7 @@ def validate_ip(ip):
 
 def write_login_log(username, type='', ip='', user_agent=''):
     if not (ip and validate_ip(ip)):
+        ip = ip[:15]
         city = "Unknown"
     else:
         city = get_ip_city(ip)
diff --git a/apps/users/views/login.py b/apps/users/views/login.py
index 83d0fd891..614f321db 100644
--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -53,7 +53,7 @@ class UserLoginView(FormView):
         if not self.request.session.test_cookie_worked():
             return HttpResponse(_("Please enable cookies and try again."))
         auth_login(self.request, form.get_user())
-        x_forwarded_for = self.request.META.get('HTTP_X_FORWARDED_FOR', '').split()
+        x_forwarded_for = self.request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')
         if x_forwarded_for:
             login_ip = x_forwarded_for[0]
         else: