diff --git a/kaplancloudaccounts/forms.py b/kaplancloudaccounts/forms.py
index b971531..38df44c 100644
--- a/kaplancloudaccounts/forms.py
+++ b/kaplancloudaccounts/forms.py
@@ -2,7 +2,7 @@
 
 from django import forms
 from django.contrib.auth import password_validation
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Group, User
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 
@@ -83,7 +83,7 @@ def save(self, commit=True):
             user.save()
             token = self.cleaned_data["token"]
             if token.user_type == 1:
-                user.groups.add(1)
+                user.groups.add(Group.objects.get(name="PM"))
                 user.is_staff = True
                 user.save()
             token.user = user
diff --git a/kaplancloudaccounts/tests.py b/kaplancloudaccounts/tests.py
index a96c51b..15cef4b 100644
--- a/kaplancloudaccounts/tests.py
+++ b/kaplancloudaccounts/tests.py
@@ -146,13 +146,13 @@ def test_save_links_token_to_user(self):
     def test_save_pm_token_sets_staff_and_group(self):
         from .forms import UserRegistrationForm
 
-        Group.objects.create(id=1, name="PM")
+        Group.objects.create(name="PM")
         pm_token = UserRegistrationToken.objects.create(user_type=1)
         form = UserRegistrationForm(data=self._form_data(token=pm_token.token))
         self.assertTrue(form.is_valid(), form.errors)
         user = form.save()
         self.assertTrue(user.is_staff)
-        self.assertTrue(user.groups.filter(id=1).exists())
+        self.assertTrue(user.groups.filter(name="PM").exists())
 
     def test_save_translator_token_not_staff(self):
         from .forms import UserRegistrationForm