diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 3d2e4e805d5d7cfe4836bc9f443b40959252e2bb..20daebad8ab63baec53d30943e7f803c76009c0b 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -190,6 +190,15 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("show_per_domain_relay_options", 0);
 		}
 
+		// APS is enabled or not
+		$global_config = $app->getconf->get_global_config('sites');
+		if($global_config['show_aps_menu'] == 'y') {
+			$app->tpl->setVar("show_aps_menu", 1);
+		} else {
+			$app->tpl->setVar("show_aps_menu", 0);
+		}
+
+
 
 		//* Set the 'customer no' default value
 		if($this->id == 0) {
diff --git a/interface/web/client/client_template_edit.php b/interface/web/client/client_template_edit.php
index dc43d90de3febaa5cf0f6e28507f4d4695ab86d0..7cc3ab5ff9742bd1d8b48bf0120a8399b6b1c954 100644
--- a/interface/web/client/client_template_edit.php
+++ b/interface/web/client/client_template_edit.php
@@ -73,6 +73,13 @@ class page_action extends tform_actions {
 		} else {
 			$app->tpl->setVar("show_per_domain_relay_options", 0);
 		}
+		// APS is enabled or not
+		$global_config = $app->getconf->get_global_config('sites');
+		if($global_config['show_aps_menu'] == 'y') {
+			$app->tpl->setVar("show_aps_menu", 1);
+		} else {
+			$app->tpl->setVar("show_aps_menu", 0);
+		}
 		parent::onShowEnd();
 	}
 
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
index 78ee149e77f3cbbd65fde088d92f3db3516c964c..7cbd6687bc40eefad4f0beaf174cad996595ea17 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -184,6 +184,14 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("show_per_domain_relay_options", 0);
 		}
 
+		// APS is enabled or not
+		$global_config = $app->getconf->get_global_config('sites');
+		if($global_config['show_aps_menu'] == 'y') {
+			$app->tpl->setVar("show_aps_menu", 1);
+		} else {
+			$app->tpl->setVar("show_aps_menu", 0);
+		}
+
 		//* Set the 'customer no' default value
 		if($this->id == 0) {
 			//* get the system config
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index b7a0ccf69c52491a23e46ed4435c2b3dca64fd9d..a4a4a9dfe71868202200ed6b19df19cba2a07a87 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -433,6 +433,7 @@
       </div>
     </div>
   </div>
+  <tmpl_if name="show_aps_menu">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingAPS">
       <h4 class="panel-title">
@@ -450,6 +451,7 @@
       </div>
     </div>
   </div>
+  </tmpl_if>
 </div>
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 8aa6d87ac72fcb721fc00e90f6c6037acc14745a..88162d92149c633e01bcb82dfc160a5394f38258 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -391,6 +391,7 @@
     </div>
   </div>
   <!-- APS -->
+  <tmpl_if name="show_aps_menu">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingAPS">
       <h4 class="panel-title">
@@ -408,6 +409,7 @@
       </div>
     </div>
   </div>
+  </tmpl_if>
   <tmpl_if name="is_admin">
   <!-- Client -->
   <div class="panel panel-default">
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index cbc8c38c57cd1b7a1ff25783126459b764f19e43..e69642bc575db2bd7287937711016628d2cbb235 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -435,6 +435,7 @@
     </div>
   </div>
   <!-- APS -->
+  <tmpl_if name="show_aps_menu">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingAPS">
       <h4 class="panel-title">
@@ -452,6 +453,7 @@
       </div>
     </div>
   </div>
+  </tmpl_if>
   <!-- Client -->
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingClient">