diff --git a/awx/main/migrations/0040_v320_add_credentialtype_model.py b/awx/main/migrations/0040_v320_add_credentialtype_model.py
index da3b4de342..a9f95135ba 100644
--- a/awx/main/migrations/0040_v320_add_credentialtype_model.py
+++ b/awx/main/migrations/0040_v320_add_credentialtype_model.py
@@ -71,14 +71,4 @@ class Migration(migrations.Migration):
             name='credential_type',
             field=models.ManyToManyField(to='main.CredentialType', blank=True),
         ),
-        migrations.AlterField(
-            model_name='credential',
-            name='credential_type',
-            field=models.ForeignKey(related_name='credentials', to='main.CredentialType', help_text='Type for this credential.  Credential Types define valid fields (e.g,. "username", "password") and their properties (e.g,. "username is required" or "password should be stored with encryption").'),
-        ),
-        migrations.AlterField(
-            model_name='credential',
-            name='inputs',
-            field=awx.main.fields.CredentialInputField(default={}, help_text='Data structure used to specify input values (e.g., {"username": "jane-doe", "password": "secret"}).  Valid fields and their requirements vary depending on the fields defined on the chosen CredentialType.', blank=True),
-        ),
     ]
diff --git a/awx/main/migrations/0042_v320_drop_v1_credential_fields.py b/awx/main/migrations/0042_v320_drop_v1_credential_fields.py
index 51daaca4c1..12e1ea1d22 100644
--- a/awx/main/migrations/0042_v320_drop_v1_credential_fields.py
+++ b/awx/main/migrations/0042_v320_drop_v1_credential_fields.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+import awx.main.fields
 
 
 class Migration(migrations.Migration):
@@ -98,6 +99,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='credential',
             name='credential_type',
-            field=models.ForeignKey(related_name='credentials', to='main.CredentialType', null=False)
-        )
+            field=models.ForeignKey(related_name='credentials', to='main.CredentialType', null=False, help_text='Type for this credential.  Credential Types define valid fields (e.g,. "username", "password") and their properties (e.g,. "username is required" or "password should be stored with encryption").')
+        ),
+        migrations.AlterField(
+            model_name='credential',
+            name='inputs',
+            field=awx.main.fields.CredentialInputField(default={}, help_text='Data structure used to specify input values (e.g., {"username": "jane-doe", "password": "secret"}).  Valid fields and their requirements vary depending on the fields defined on the chosen CredentialType.', blank=True),
+        ),
     ]