diff --git a/gnuviechadmin/osusers/models.py b/gnuviechadmin/osusers/models.py
index 6ad01b9..801f6ba 100644
--- a/gnuviechadmin/osusers/models.py
+++ b/gnuviechadmin/osusers/models.py
@@ -1,7 +1,7 @@
 from datetime import date
 import os
 
-from django.db import models
+from django.db import models, transaction
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils import timezone
@@ -176,6 +176,7 @@ class UserManager(models.Manager):
                 break
         return nextuser
 
+    @transaction.atomic
     def create_user(self, username=None, password=None, commit=False):
         uid = self.get_next_uid()
         gid = Group.objects.get_next_gid()