diff --git a/beat/web/accounts/api.py b/beat/web/accounts/api.py
index bf56928b9e4a93e1e6b0f567ac979d1c7960ba9c..117a50cf104c1371cc5fda75ae485f5252958184 100644
--- a/beat/web/accounts/api.py
+++ b/beat/web/accounts/api.py
@@ -65,7 +65,10 @@ from ..common.responses import BadRequestResponse, ForbiddenResponse
 
 import datetime
 import re
-from urlparse import urlparse
+try:
+  from urlparse import urlparse
+except ImportError:
+  from urllib.parse import urlparse
 
 import simplejson as json
 
@@ -99,7 +102,7 @@ class SupervisorListView(generics.ListAPIView):
         #On all cases check the current key in supervisee profile match the supervisiontrack key as this is the current supervision request/track from the supervisee
         queryset    = SupervisionTrack.objects.filter(supervisor=request.user).filter(Q(supervisee__profile__status=Profile.WAITINGVALIDATION)|Q(supervisee__profile__status=Profile.REJECTED)|Q(supervisee__profile__status=Profile.YEARREVALIDATION)|Q(supervisee__profile__status=Profile.ACCEPTED)|Q(supervisee__profile__status=Profile.BLOCKED)).filter(Q(supervisee__profile__supervision_key=models.F('supervision_key')))
         serializer  = FullSupervisionTrackSerializer(queryset, many=True, context ={'request': request})
-        
+
         return Response(serializer.data)