diff --git a/knox/migrations/0006_auto_20160818_0932.py b/knox/migrations/0006_auto_20160818_0932.py
index b8540905..8c1c7412 100644
--- a/knox/migrations/0006_auto_20160818_0932.py
+++ b/knox/migrations/0006_auto_20160818_0932.py
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(cleanup_tokens),
+        migrations.RunPython(cleanup_tokens, reverse_code=migrations.RunPython.noop),
         migrations.AlterField(
             model_name='authtoken',
             name='token_key',
diff --git a/knox/models.py b/knox/models.py
index b054f289..203f62b8 100644
--- a/knox/models.py
+++ b/knox/models.py
@@ -17,7 +17,8 @@ def create(
         self,
         user,
         expiry=knox_settings.TOKEN_TTL,
-        prefix=knox_settings.TOKEN_PREFIX
+        prefix=knox_settings.TOKEN_PREFIX,
+        **extra_fields
     ):
         token = prefix + crypto.create_token_string()
         digest = crypto.hash_token(token)
@@ -25,7 +26,7 @@ def create(
             expiry = timezone.now() + expiry
         instance = super(AuthTokenManager, self).create(
             token_key=token[:CONSTANTS.TOKEN_KEY_LENGTH], digest=digest,
-            user=user, expiry=expiry)
+            user=user, expiry=expiry, **extra_fields)
         return instance, token