diff --git a/aleksis/core/migrations/0001_initial.py b/aleksis/core/migrations/0001_initial.py
index 183dbf5b2902c4fbd216f4787b5edf88445ac624..4dd6486f478a00e23a42876d302bbbe954648084 100644
--- a/aleksis/core/migrations/0001_initial.py
+++ b/aleksis/core/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.5 on 2020-05-04 12:00
+# Generated by Django 3.0.5 on 2020-05-04 14:16
 
 import aleksis.core.mixins
 import aleksis.core.util.core_helpers
@@ -17,8 +17,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contenttypes', '0002_remove_content_type_name'),
         ('sites', '0002_alter_domain_unique'),
     ]
 
@@ -93,7 +93,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
                 ('name', models.CharField(max_length=255, unique=True, verbose_name='Long name')),
-                ('short_name', models.CharField(blank=True, max_length=255, unique=True, verbose_name='Short name')),
+                ('short_name', models.CharField(blank=True, max_length=255, null=True, unique=True, verbose_name='Short name')),
                 ('additional_fields', models.ManyToManyField(to='core.AdditionalField', verbose_name='Additional fields')),
             ],
             options={
@@ -115,7 +115,7 @@ class Migration(migrations.Migration):
                 ('first_name', models.CharField(max_length=255, verbose_name='First name')),
                 ('last_name', models.CharField(max_length=255, verbose_name='Last name')),
                 ('additional_name', models.CharField(blank=True, max_length=255, verbose_name='Additional name(s)')),
-                ('short_name', models.CharField(blank=True, max_length=255, unique=True, verbose_name='Short name')),
+                ('short_name', models.CharField(blank=True, max_length=255, null=True, unique=True, verbose_name='Short name')),
                 ('street', models.CharField(blank=True, max_length=255, verbose_name='Street')),
                 ('housenumber', models.CharField(blank=True, max_length=255, verbose_name='Street number')),
                 ('postal_code', models.CharField(blank=True, max_length=255, verbose_name='Postal code')),
diff --git a/aleksis/core/models.py b/aleksis/core/models.py
index ad67770c3166b6d060e977e5962f0512822003c1..85ea38aeae10064bd424d08fec8df31c5deca81d 100644
--- a/aleksis/core/models.py
+++ b/aleksis/core/models.py
@@ -81,7 +81,7 @@ class Person(ExtensibleModel):
     )
 
     short_name = models.CharField(
-        verbose_name=_("Short name"), max_length=255, blank=True, unique=True
+        verbose_name=_("Short name"), max_length=255, blank=True, null=True, unique=True # noqa
     )
 
     street = models.CharField(verbose_name=_("Street"), max_length=255, blank=True)
@@ -257,7 +257,7 @@ class Group(ExtensibleModel):
 
     name = models.CharField(verbose_name=_("Long name"), max_length=255, unique=True)
     short_name = models.CharField(
-        verbose_name=_("Short name"), max_length=255, unique=True, blank=True
+        verbose_name=_("Short name"), max_length=255, unique=True, blank=True, null=True # noqa
     )
 
     members = models.ManyToManyField(