diff --git a/accounts/views.py b/accounts/views.py
index 23b6459..78c6bb2 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -13,6 +13,7 @@ from rest_framework_simplejwt.authentication import JWTAuthentication
 from rest_framework_simplejwt.tokens import RefreshToken
 from .serializers import *
 
+
 class UserRegistrationView(GenericAPIView):
     permission_classes = (AllowAny,)
     serializer_class = UserRegistrationSerializer
@@ -25,7 +26,7 @@ class UserRegistrationView(GenericAPIView):
         data = serializer.data
 
         data["tokens"] = {"refresh": str(token),
-        "access": str(token.access_token)}
+                          "access": str(token.access_token)}
         return Response(data, status=status.HTTP_201_CREATED)
     #     if serializer.is_valid():
     #         user = serializer.save()
@@ -39,13 +40,15 @@ class UserLoginView(GenericAPIView):
     serializer_class = UserLoginSerializer
 
     def post(self, request, *args, **kwargs):
-        serializer = self.get_serializer(data = request.data)
+        serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         user = serializer.validated_data
         serializer = CustomUserSerializer(user)
-        token = {"refresh": str(token),
-         "access": str(token.access_token)}
-        return Response(data, status = status.HTTP_200_OK)
+        token = RefreshToken.for_user(user)
+        data = serializer.data
+        data["tokens"] = {"refresh": str(token),
+                          "access": str(token.access_token)}
+        return Response(data, status=status.HTTP_200_OK)
 # class UserLoginView(APIView):
 #     authentication_classes = [JWTAuthentication]
 #     permission_classes = [IsAuthenticated]