Merge pull request bread-and-pepper#325 from h3/master

Fixing issue #324 for Django 1.5
interalia-desarrolloweb · Jun 17, 2013 · af75b23 · af75b23
2 parents e442c96 + 0de7bb6
commit af75b23
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/userena/admin.py b/userena/admin.py
@@ -16,6 +16,10 @@ class UserenaAdmin(UserAdmin, GuardedModelAdmin):
                     'is_staff', 'is_active', 'date_joined')
     list_filter = ('is_staff', 'is_superuser', 'is_active')
 
-admin.site.unregister(get_user_model())
+try:
+    admin.site.unregister(get_user_model())
+except admin.sites.NotRegistered:
+    pass
+
 admin.site.register(get_user_model(), UserenaAdmin)
 admin.site.register(get_profile_model())