diff --git a/xos/admin.py b/xos/admin.py
index f05b369..45c1083 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -30,6 +30,7 @@
     xosEndpoint = forms.CharField(required=False)
     xosUser = forms.CharField(required=False)
     xosPassword = forms.CharField(required=False)
+    vtnAPIVersion = forms.IntegerField(required=False)
 
     def __init__(self,*args,**kwargs):
         super (VTNServiceForm,self ).__init__(*args,**kwargs)
@@ -44,6 +45,7 @@
             self.fields['xosEndpoint'].initial = self.instance.xosEndpoint
             self.fields['xosUser'].initial = self.instance.xosUser
             self.fields['xosPassword'].initial = self.instance.xosPassword
+            self.fields['vtnAPIVersion'].initial = self.instance.vtnAPIVersion
 
     def save(self, commit=True):
         self.instance.privateGatewayMac = self.cleaned_data.get("privateGatewayMac")
@@ -56,6 +58,7 @@
         self.instance.xosEndpoint = self.cleaned_data.get("xosEndpoint")
         self.instance.xosUser = self.cleaned_data.get("xosUser")
         self.instance.xosPassword = self.cleaned_data.get("xosPassword")
+        self.instance.vtnAPIVersion = self.cleaned_data.get("vtnAPIVersion")
         return super(VTNServiceForm, self).save(commit=commit)
 
     class Meta:
@@ -70,7 +73,7 @@
     list_display = ("backend_status_icon", "name", "enabled")
     list_display_links = ('backend_status_icon', 'name', )
     fieldsets = [(None, {'fields': ['backend_status_text', 'name','enabled','versionNumber','description',"view_url","icon_url",
-                                    'privateGatewayMac', 'localManagementIp', 'ovsdbPort', 'sshPort', 'sshUser', 'sshKeyFile', 'mgmtSubnetBits', 'xosEndpoint', 'xosUser', 'xosPassword' ], 'classes':['suit-tab suit-tab-general']})]
+                                    'privateGatewayMac', 'localManagementIp', 'ovsdbPort', 'sshPort', 'sshUser', 'sshKeyFile', 'mgmtSubnetBits', 'xosEndpoint', 'xosUser', 'xosPassword', 'vtnAPIVersion' ], 'classes':['suit-tab suit-tab-general']})]
     readonly_fields = ('backend_status_text', )
     inlines = [SliceInline,ServiceAttrAsTabInline,ServicePrivilegeInline]
 
