diff --git a/xos/vpn/admin.py b/xos/vpn/admin.py
index f69ca48..7639d24 100644
--- a/xos/vpn/admin.py
+++ b/xos/vpn/admin.py
@@ -40,8 +40,6 @@
 
 class VPNTenantForm(forms.ModelForm):
     creator = forms.ModelChoiceField(queryset=User.objects.all())
-    # They key used to connect to this server
-    server_key = forms.CharField(required=False)
 
     def __init__(self, *args, **kwargs):
         super(VPNTenantForm, self).__init__(*args, **kwargs)
@@ -56,7 +54,6 @@
             self.fields['creator'].initial = self.instance.creator
             self.fields['server_key'].initial = self.instance.server_key
 
-        # If there is not an instance then we need to set initial values.
         if (not self.instance) or (not self.instance.pk):
             self.fields['creator'].initial = get_request().user
             self.fields['server_key'].initial = self.generate_VPN_key()
diff --git a/xos/vpn/models.py b/xos/vpn/models.py
index 53ee491..c6d0d11 100644
--- a/xos/vpn/models.py
+++ b/xos/vpn/models.py
@@ -46,7 +46,7 @@
             self.default_attributes['server_key'])
 
     @server_key.setter
-    def display_message(self, value):
+    def server_key(self, value):
         self.set_attribute("server_key", value)
 
     @property