2 files changed, 8 insertions, 1 deletions
diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py
index f4e052e4..b0c81bf1 100644
--- a/rest_framework/authtoken/migrations/0001_initial.py
+++ b/rest_framework/authtoken/migrations/0001_initial.py
@@ -4,6 +4,8 @@ from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
 
+from rest_framework.settings import api_settings
+
 
 try:
     from django.contrib.auth import get_user_model
@@ -15,6 +17,8 @@ else:
 
 class Migration(SchemaMigration):
 
+    depends_on = api_settings.REQUIRED_MIGRATIONS
+
     def forwards(self, orm):
         # Adding model 'Token'
         db.create_table('authtoken_token', (
@@ -45,7 +49,7 @@ class Migration(SchemaMigration):
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
         "%s.%s" % (User._meta.app_label, User._meta.module_name): {
-            'Meta': {'object_name': 'User'},
+            'Meta': {'object_name': User._meta.module_name},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index b7aa0bbe..31912215 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -76,6 +76,9 @@ DEFAULTS = {
     'URL_FORMAT_OVERRIDE': 'format',
 
     'FORMAT_SUFFIX_KWARG': 'format',
+
+    # Authtoken
+    'REQUIRED_MIGRATIONS': (),
 }