diff --git a/accounts/admin.py b/accounts/admin.py
new file mode 100644
index 0000000000000000000000000000000000000000..c03dbab29e0fd83024a5a34871ff1d64219c0dce
--- /dev/null
+++ b/accounts/admin.py
@@ -0,0 +1,10 @@
+from django.contrib import admin
+from flowspy.accounts.models import *
+from django.contrib.auth.models import User
+from flowspy.peers.models import *
+from django.conf import settings
+
+class UserPrAdmin(admin.ModelAdmin):
+    list_display = ('user', 'peer')
+
+admin.site.register(UserProfile, UserPrAdmin)
\ No newline at end of file
diff --git a/flowspec/admin.py b/flowspec/admin.py
index 03f612763edcaf6aafe263b8deb65afd37563beb..f89064c0336e5a29d23080067a295552621beed7 100644
--- a/flowspec/admin.py
+++ b/flowspec/admin.py
@@ -5,7 +5,6 @@ from utils import proxy as PR
 from flowspec.tasks import *
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin
-from flowspy.accounts.models import UserProfile
 from flowspy.peers.models import *
 from flowspy.flowspec.forms import *
 import datetime
@@ -76,7 +75,6 @@ class UserProfileAdmin(UserAdmin):
 admin.site.unregister(User)
 admin.site.register(MatchPort)
 admin.site.register(MatchDscp)
-admin.site.register(UserProfile)
 admin.site.register(ThenAction)
 admin.site.register(Route, RouteAdmin)
 admin.site.register(User, UserProfileAdmin)