diff --git a/apps/orgs/migrations/0002_auto_20180903_1132.py b/apps/orgs/migrations/0002_auto_20180903_1132.py
index 83bdf2522..cdd24ef35 100644
--- a/apps/orgs/migrations/0002_auto_20180903_1132.py
+++ b/apps/orgs/migrations/0002_auto_20180903_1132.py
@@ -18,6 +18,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='organization',
             name='members',
-            field=models.ManyToManyField(related_name='orgs', through='rbac.RoleBinding', to=settings.AUTH_USER_MODEL),
+            field=models.ManyToManyField(related_name='orgs', through='rbac.RoleBinding', through_fields=('org', 'user'), to=settings.AUTH_USER_MODEL),
         ),
     ]
diff --git a/apps/terminal/migrations/0001_initial.py b/apps/terminal/migrations/0001_initial.py
index a5cd1ec0c..8d80979dc 100644
--- a/apps/terminal/migrations/0001_initial.py
+++ b/apps/terminal/migrations/0001_initial.py
@@ -414,6 +414,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='virtualapp',
             name='providers',
-            field=models.ManyToManyField(through='terminal.VirtualAppPublication', to='terminal.appprovider', verbose_name='Providers'),
+            field=models.ManyToManyField(through='terminal.VirtualAppPublication', through_fields=('app', 'provider'), to='terminal.appprovider', verbose_name='Providers'),
         ),
     ]
diff --git a/apps/terminal/migrations/0002_auto_20171228_0025.py b/apps/terminal/migrations/0002_auto_20171228_0025.py
index 39141ccb2..05e291368 100644
--- a/apps/terminal/migrations/0002_auto_20171228_0025.py
+++ b/apps/terminal/migrations/0002_auto_20171228_0025.py
@@ -73,7 +73,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='appprovider',
             name='apps',
-            field=models.ManyToManyField(through='terminal.VirtualAppPublication', to='terminal.virtualapp', verbose_name='Virtual app'),
+            field=models.ManyToManyField(through='terminal.VirtualAppPublication', through_fields=('provider', 'app'), to='terminal.virtualapp', verbose_name='Virtual app'),
         ),
         migrations.AddField(
             model_name='appprovider',
@@ -98,7 +98,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='applethost',
             name='applets',
-            field=models.ManyToManyField(through='terminal.AppletPublication', to='terminal.applet', verbose_name='Applet'),
+            field=models.ManyToManyField(through='terminal.AppletPublication', through_fields=('host', 'applet'), to='terminal.applet', verbose_name='Applet'),
         ),
         migrations.AddField(
             model_name='applethost',
@@ -108,7 +108,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='applet',
             name='hosts',
-            field=models.ManyToManyField(through='terminal.AppletPublication', to='terminal.applethost', verbose_name='Hosts'),
+            field=models.ManyToManyField(through='terminal.AppletPublication', through_fields=('applet', 'host'), to='terminal.applethost', verbose_name='Hosts'),
         ),
         migrations.AlterUniqueTogether(
             name='virtualapppublication',