diff --git a/guardian/views.py b/guardian/views.py
index cfb9f1b..0ec7217 100644
--- a/guardian/views.py
+++ b/guardian/views.py
@@ -63,7 +63,7 @@ class SignupViewset(viewsets.ModelViewSet):
         if request.data['user_type'] in [str(NUMBER['one']), str(NUMBER['two'])]:
             serializer = UserSerializer(context=request.data['user_type'], data=request.data)
             if serializer.is_valid():
-                serializer.save()
+                user = serializer.save()
                 """Generate otp"""
                 otp = generate_otp()
                 # expire otp after 1 day
@@ -73,10 +73,7 @@ class SignupViewset(viewsets.ModelViewSet):
                                             user_type=str(request.data['user_type']), expired_at=expiry)
                 """Send email to the register user"""
                 send_otp_email(request.data['email'], otp)
-                device_details, created = UserDeviceDetails.objects.get_or_create(user=user)
-                if device_details:
-                    device_details.device_id = device_id
-                    device_details.save()
+                UserDeviceDetails.objects.create(user=user, device_id=device_id)
                 return custom_response(SUCCESS_CODE['3001'],
                                        response_status=status.HTTP_200_OK)
             return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)