diff --git a/cotisations/migrations/0032_chequepayment_comnpaypayment.py b/cotisations/migrations/0032_chequepayment_comnpaypayment.py
index 9c3fab02..81fada42 100644
--- a/cotisations/migrations/0032_chequepayment_comnpaypayment.py
+++ b/cotisations/migrations/0032_chequepayment_comnpaypayment.py
@@ -31,17 +31,18 @@ def add_comnpay(apps, schema_editor):
     comnpay.payment = payment
     comnpay.save()
     payment.moyen = "ComnPay"
+
     payment.save()
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('preferences', '0044_remove_payment_pass'),
         ('cotisations', '0031_article_allow_self_subscription'),
     ]
 
     operations = [
-        migrations.RunSQL('update preferences_assooption set payment_pass="" where id=1;'),
         migrations.CreateModel(
             name='ChequePayment',
             fields=[
@@ -60,6 +61,6 @@ class Migration(migrations.Migration):
             ],
             bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
         ),
-        migrations.RunPython(add_comnpay),
-        migrations.RunPython(add_cheque),
+        # migrations.RunPython(add_comnpay),
+        # migrations.RunPython(add_cheque),
     ]
diff --git a/preferences/migrations/0044_remove_payment_pass.py b/preferences/migrations/0044_remove_payment_pass.py
new file mode 100644
index 00000000..23d45145
--- /dev/null
+++ b/preferences/migrations/0044_remove_payment_pass.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-05 13:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0035_optionaluser_allow_self_subscription'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='assooption',
+            name='payment_pass',
+        ),
+    ]
+
diff --git a/preferences/migrations/0036_auto_20180705_0840.py b/preferences/migrations/0045_remove_unused_payment_fields.py
similarity index 85%
rename from preferences/migrations/0036_auto_20180705_0840.py
rename to preferences/migrations/0045_remove_unused_payment_fields.py
index 9dc67dac..49c628d4 100644
--- a/preferences/migrations/0036_auto_20180705_0840.py
+++ b/preferences/migrations/0045_remove_unused_payment_fields.py
@@ -8,7 +8,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('preferences', '0035_optionaluser_allow_self_subscription'),
+        ('preferences', '0044_remove_payment_pass'),
+        ('cotisations', '0032_chequepayment_comnpaypayment'),
     ]
 
     operations = [
@@ -20,10 +21,6 @@ class Migration(migrations.Migration):
             model_name='assooption',
             name='payment_id',
         ),
-        migrations.RemoveField(
-            model_name='assooption',
-            name='payment_pass',
-        ),
         migrations.RemoveField(
             model_name='optionaluser',
             name='allow_self_subscription',
diff --git a/topologie/migrations/0030_auto_20171004_0235.py b/topologie/migrations/0030_auto_20171004_0235.py
index 83f3b022..ac3ceeba 100644
--- a/topologie/migrations/0030_auto_20171004_0235.py
+++ b/topologie/migrations/0030_auto_20171004_0235.py
@@ -10,6 +10,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('topologie', '0029_auto_20171002_0334'),
+        ('machines', '0049_vlan'),
     ]
 
     operations = [