diff --git a/app/conf/common.py b/app/conf/common.py
index e294130..c2051ce 100644
--- a/app/conf/common.py
+++ b/app/conf/common.py
@@ -33,6 +33,7 @@ MIDDLEWARE_CLASSES = (
     'sso.middleware.InactiveLogoutMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'sso.middleware.IGBMiddleware',
+    'sso.middleware.IPTrackingMiddleware',
 )
 
 ROOT_URLCONF = 'urls'
diff --git a/app/sso/middleware.py b/app/sso/middleware.py
index d7f0a62..0670e53 100644
--- a/app/sso/middleware.py
+++ b/app/sso/middleware.py
@@ -58,9 +58,6 @@ class IPTrackingMiddleware(object):
     def process_request(self, request):
 
         if request.user and not request.user.is_anonymous():
-            try:
-                ip = SSOUserIPAddress.objects.get(user=request.user, ip_address=request.META['REMOTE_ADDR'])
-            except SSOUserIPAddress.DoesNotExist:
-                ip = SSOUserIPAddress(user=request.user, ip_address=request.META['REMOTE_ADDR'])
+            ip = SSOUserIPAddress.objects.get_or_create(user=request.user, ip_address=request.META['REMOTE_ADDR'])
             ip.last_seen = datetime.utcnow()
             ip.save()