diff --git a/test_oauth/backend.py b/test_oauth/backend.py
index f584dfb5a974ad8911619a13caea49bfabc9a833..1cf1ce1adc192610c829b4b453509488e8142996 100644
--- a/test_oauth/backend.py
+++ b/test_oauth/backend.py
@@ -24,9 +24,11 @@ class TESTOAuth2Backend(ModelBackend):
         self.run_verifiers(profile)
 
         if getattr(settings, 'TEST_OAUTH_RESPECT_ID', False):
-            user, _ = get_user_model().objects.get_or_create(
+            user, _ = get_user_model().objects.update_or_create(
                 pk=profile['id'],
-                username=profile['username']
+                defaults={
+                    'username': profile['username']
+                }
             )
         else:
             user, _ = get_user_model().objects.get_or_create(
@@ -80,8 +82,11 @@ class TESTOAuth2Backend(ModelBackend):
         user.groups.clear()
 
         for g in groups:
-            group, _ = Group.objects.get_or_create(
-                id=g['id'], name=g['name']
+            group, _ = Group.objects.update_or_create(
+                id=g['id'],
+                defaults={
+                    'name': g['name']
+                }
             )
 
             user.groups.add(group)