diff --git a/admin/migrations/0019_set_default_group.py b/admin/migrations/0019_set_default_group.py
index e0b2a0b42..44099dc30 100644
--- a/admin/migrations/0019_set_default_group.py
+++ b/admin/migrations/0019_set_default_group.py
@@ -8,7 +8,10 @@ class Migration(DataMigration):
 
     def forwards(self, orm):
         "Write your forwards methods here."
-        sugroup = orm["auth.Group"].objects.get(name="SimpleUsers")
+        try:
+            sugroup = orm["auth.Group"].objects.get(name="SimpleUsers")
+        except orm["auth.Group"].DoesNotExist:
+            return
         for account in orm["auth.User"].objects.all():
             if not len(account.groups.all()):
                 account.groups.add(sugroup)
diff --git a/templates/admin/editdomainform.html b/templates/admin/editdomainform.html
index fa6bbf820..5f3079be1 100644
--- a/templates/admin/editdomainform.html
+++ b/templates/admin/editdomainform.html
@@ -28,7 +28,7 @@
     <div class="row"><span class="title">{% trans "Last modification date" %}</span><span>{{ domain.last_modification }}</<span></div>
     <div class="row"><span class="title">{% trans "Domain aliases" %}</span><span>{{ domain.domainalias_count }}</<span></div>
     <div class="row"><span class="title">{% trans "Mailboxes" %}</span><span>{{ domain.mailbox_count }}</<span></div>
-    <div class="row"><span class="title">{% trans "Mailbox aliase" %}</span><span>{{ domain.mbalias_count }}</<span></div>
+    <div class="row"><span class="title">{% trans "Mailbox aliases" %}</span><span>{{ domain.mbalias_count }}</<span></div>
   </div>
 </div>
 {% endblock %}