diff --git a/plinth/modules/expert_mode/expert_mode.py b/plinth/modules/expert_mode/expert_mode.py
index b55992fa9..f7c40939c 100644
--- a/plinth/modules/expert_mode/expert_mode.py
+++ b/plinth/modules/expert_mode/expert_mode.py
@@ -5,7 +5,7 @@ from django.template.response import TemplateResponse
 from gettext import gettext as _
 
 from plinth import cfg
-from plinth.modules.lib.auth import get_group
+from plinth.modules.lib.auth import get_or_create_group
 
 
 class ExpertsForm(forms.Form):  # pylint: disable-msg=W0232
@@ -51,7 +51,7 @@ def _apply_changes(request, new_status):
     """Apply expert mode configuration"""
     message = (messages.info, _('Settings unchanged'))
 
-    expert_group = get_group('Expert')
+    expert_group = get_or_create_group('Expert')
     if new_status['expert_mode']:
         if not expert_group in request.user.groups.all():
             request.user.groups.add(expert_group)
diff --git a/plinth/modules/lib/auth.py b/plinth/modules/lib/auth.py
index 0ff7bb82b..7b4c19ed2 100644
--- a/plinth/modules/lib/auth.py
+++ b/plinth/modules/lib/auth.py
@@ -15,10 +15,10 @@ def add_user(username, passphrase, name='', email='', expert=False):
     user.save()
 
     if expert:
-        user.groups.add(get_group('Expert'))
+        user.groups.add(get_or_create_group('Expert'))
 
 
-def get_group(name):
+def get_or_create_group(name):
     """Return an existing or newly created group with given name"""
     try:
         group = Group.objects.get(name__exact=name)