diff --git a/xos/core/admin.py b/xos/core/admin.py
index 815e1c6..cfa38f9 100644
--- a/xos/core/admin.py
+++ b/xos/core/admin.py
@@ -894,7 +894,7 @@
 
 class TenantRoleAdmin(XOSBaseAdmin):
     model = TenantRole
-    fields = ('role',)
+    pass
 
 class TenantPrivilegeInline(XOSTabularInline):
     model = TenantPrivilege
@@ -2177,6 +2177,7 @@
     admin.site.register(TenantRoot, TenantRootAdmin)
     admin.site.register(TenantRootRole, TenantRootRoleAdmin)
     admin.site.register(Tenant, TenantAdmin)
+    admin.site.register(TenantRole)
     admin.site.register(TenantRole, TenantRoleAdmin)
     admin.site.register(TenantAttribute, TenantAttributeAdmin)
 #    admin.site.register(Container, ContainerAdmin)
diff --git a/xos/services/vpn/admin.py b/xos/services/vpn/admin.py
index 9567377..fbc0ede 100644
--- a/xos/services/vpn/admin.py
+++ b/xos/services/vpn/admin.py
@@ -125,7 +125,9 @@
     is_persistent = forms.BooleanField(required=False)
     clients_can_see_each_other = forms.BooleanField(required=False)
     failover_servers = forms.ModelMultipleChoiceField(
-        queryset=VPNTenant.get_tenant_objects(), required=False)
+        queryset=VPNTenant.get_tenant_objects(),
+        required=False,
+        widget=forms.CheckboxSelectMultiple())
     protocol = forms.ChoiceField(required=True, choices=[
         ("udp", "udp"), ("tcp", "tcp")])