diff --git a/api/funkwhale_api/federation/migrations/0002_auto_20180403_1620.py b/api/funkwhale_api/federation/migrations/0002_auto_20180403_1620.py
new file mode 100644
index 0000000000000000000000000000000000000000..2200424d8e8cfe9a05c059e305d2533dfcda1121
--- /dev/null
+++ b/api/funkwhale_api/federation/migrations/0002_auto_20180403_1620.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.3 on 2018-04-03 16:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('federation', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='actor',
+            unique_together={('domain', 'preferred_username')},
+        ),
+    ]
diff --git a/api/funkwhale_api/federation/models.py b/api/funkwhale_api/federation/models.py
index 35ddce961c22d61641fa3f658bd291b078c10568..414bcc50a9a150c5b64ccab800586d33ba41b7c7 100644
--- a/api/funkwhale_api/federation/models.py
+++ b/api/funkwhale_api/federation/models.py
@@ -32,6 +32,9 @@ class Actor(models.Model):
         default=timezone.now)
     manually_approves_followers = models.NullBooleanField(default=None)
 
+    class Meta:
+        unique_together = ['domain', 'preferred_username']
+
     @property
     def webfinger_subject(self):
         return '{}@{}'.format(