diff --git a/client/src/views/biz-subscription-server-list.vue b/client/src/views/biz-subscription-server-list.vue
index a7457b6..2a0190a 100644
--- a/client/src/views/biz-subscription-server-list.vue
+++ b/client/src/views/biz-subscription-server-list.vue
@@ -9,11 +9,11 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="customer-list"
-      data-list-key="CustomerDataList"
+      form-key="subscription-server-list"
+      data-list-key="SubscriptionServerDataList"
       :show-select="rights.read"
       :reload="reload"
-      data-cy="customersTable"
+      data-cy="subscription-serversTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @selection-change="handleSelected"
@@ -24,12 +24,12 @@
 </template>
 
 <script>
-const FORM_KEY = "customer-list";
+const FORM_KEY = "subscription-server-list";
 export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.Customer,
+      aType: window.$gz.type.SubscriptionServer,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -37,11 +37,11 @@ export default {
     };
   },
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.Customer);
+    this.rights = window.$gz.role.getRights(window.$gz.type.SubscriptionServer);
     window.$gz.eventBus.$on("menu-click", clickHandler);
 
     //------ pre-filter ----
-    //OPTIONAL "Show All customers of head office" FILTER
+    //OPTIONAL "Show All subscription-servers of head office" FILTER
     this.objectId = window.$gz.util.stringToIntOrNull(
       this.$route.params.objectId
     );
@@ -89,7 +89,7 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "customer-edit",
+          name: "subscription-server-edit",
           params: { recordid: 0 }
         });
         break;
@@ -97,7 +97,7 @@ async function clickHandler(menuItem) {
         {
           const res = await m.vm.$refs.extensions.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.Customer
+              window.$gz.type.SubscriptionServer
             )
           );
           if (res && res.refresh == true) {
@@ -109,7 +109,7 @@ async function clickHandler(menuItem) {
         {
           const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.Customer
+              window.$gz.type.SubscriptionServer
             ),
             m.id
           );
@@ -134,12 +134,12 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   const menuOptions = {
     isMain: true,
-    icon: "$sockiAddressCard",
-    title: "CustomerList",
-    helpUrl: "customers",
+    icon: "$sockiCloud",
+    title: "SubscriptionServerList",
+    helpUrl: "subscription-servers",
     menuItems: [],
     formData: {
-      sockType: window.$gz.type.Customer
+      sockType: window.$gz.type.SubscriptionServer
     }
   };
 
diff --git a/client/src/views/biz-subscription-server.vue b/client/src/views/biz-subscription-server.vue
index dacb371..e483f91 100644
--- a/client/src/views/biz-subscription-server.vue
+++ b/client/src/views/biz-subscription-server.vue
@@ -633,7 +633,7 @@ function generateMenu(vm) {
   const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
-    icon: "$sockiBarCode",
+    icon: "$sockiCloud",
     title: "SubscriptionServer",
     helpUrl: "svc-subscription-servers",
     formData: {
diff --git a/server/biz/FormFieldReference.cs b/server/biz/FormFieldReference.cs
index 5142a6f..989c26a 100644
--- a/server/biz/FormFieldReference.cs
+++ b/server/biz/FormFieldReference.cs
@@ -391,6 +391,26 @@ namespace Sockeye.Biz
                 }
                 #endregion
 
+                   #region SubscriptionServer
+                {
+                    List<FormField> l = new List<FormField>();
+                    l.Add(new FormField { TKey = "SubServerNotes", FieldKey = "SubServerNotes" });
+                    l.Add(new FormField { TKey = "SubServerLastUpdated", FieldKey = "SubServerLastUpdated" });
+                    l.Add(new FormField { TKey = "SubServerTrialContact", FieldKey = "SubServerTrialContact" });
+                    l.Add(new FormField { TKey = "SubServerOperatingSystem", FieldKey = "SubServerOperatingSystem" });
+                    l.Add(new FormField { TKey = "SubServerTrialCompany", FieldKey = "SubServerTrialCompany" });
+                    l.Add(new FormField { TKey = "SubServerTrialEmail", FieldKey = "SubServerTrialEmail" });
+                    l.Add(new FormField { TKey = "SubServerCustomerDomain", FieldKey = "SubServerCustomerDomain" });
+
+                    l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
+                    l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
+                    l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments", Requireable = false });
+
+
+                    _formFields.Add(SockType.SubscriptionServer.ToString(), l);
+                }
+                #endregion
+
 
                 //******************************************************
             }