diff --git a/loginSystem/views.py b/loginSystem/views.py
index b10f7f658..d07e7bcaa 100644
--- a/loginSystem/views.py
+++ b/loginSystem/views.py
@@ -114,13 +114,17 @@ def verifyLogin(request):
 
                 request.session['userID'] = admin.pk
 
-                ipAddr = request.META.get('REMOTE_ADDR')
+                ipAddr = request.META.get('HTTP_CF_CONNECTING_IP')
+                if ipAddr is None:
+                    ipAddr = request.META.get('REMOTE_ADDR')
 
                 if ipAddr.find(':') > -1:
                     ipAddr = ipAddr.split(':')[:3]
-                    request.session['ipAddr'] = ''.join(ipAddr)
+                    request.session['ipAddr'] = ipAddr
                 else:
-                    request.session['ipAddr'] = request.META.get('REMOTE_ADDR')
+                    request.session['ipAddr'] = request.META.get('HTTP_CF_CONNECTING_IP')
+                    if request.session['ipAddr'] is None:
+                        request.session['ipAddr'] = request.META.get('REMOTE_ADDR')
 
                 request.session.set_expiry(43200)
                 data = {'userID': admin.pk, 'loginStatus': 1, 'error_message': "None"}