diff --git a/flowspec/admin.py b/flowspec/admin.py
index c8e59d83f7755c78a518686babfaf08f8d11d6a0..69f4637e405b5e106be21853199f1c455afd4e6e 100644
--- a/flowspec/admin.py
+++ b/flowspec/admin.py
@@ -5,10 +5,26 @@ 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 accounts.models import UserProfile
+from flowspy.accounts.models import UserProfile
+from flowspy.peers.models import *
 from flowspy.flowspec.forms import *
 import datetime
 from django.conf import settings
+from django.forms import ModelForm
+from django.contrib.admin.widgets import FilteredSelectMultiple
+
+class PeerAdminForm(ModelForm):
+    networks=forms.ModelMultipleChoiceField(PeerRange.objects.all(),widget=
+            FilteredSelectMultiple("PeerRange",True), required=False)
+
+    class Meta:
+        model= Peer
+
+class PeerAdmin(admin.ModelAdmin):
+    form = PeerAdminForm
+
+class PeerTechcAdmin(admin.ModelAdmin):
+    list_display = ('get_peer_name', 'emails')
 
 class RouteAdmin(admin.ModelAdmin):
     form = RouteForm
@@ -71,6 +87,8 @@ admin.site.register(UserProfile)
 admin.site.register(ThenAction)
 #admin.site.register(ThenStatement)
 #admin.site.register(MatchStatement)
+admin.site.register(Peer, PeerAdmin)
+admin.site.register(PeerTechc, PeerTechcAdmin)
 admin.site.register(Route, RouteAdmin)
 admin.site.register(User, UserProfileAdmin)
 admin.site.disable_action('delete_selected')
diff --git a/peers/models.py b/peers/models.py
index 11785097fa17028221c8a9eac62683c87ab2407d..16c5e72058b03fb4847c205d542751d8e29b153f 100644
--- a/peers/models.py
+++ b/peers/models.py
@@ -50,5 +50,8 @@ class PeerTechc(models.Model):
     def __unicode__(self):
         return "%s %s" %(self.peer_id.peer_name, self.emails)
 
+    def get_peer_name(self):
+        return "%s" %self.peer_id.peer_name
+
     class Meta:
         db_table="v_tech_c_peers"