diff --git a/accounts.php b/accounts.php
index a79c640..919487c 100644
--- a/accounts.php
+++ b/accounts.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
diff --git a/api/v0/authorization.php b/api/v0/authorization.php
index e97bce4..537052e 100644
--- a/api/v0/authorization.php
+++ b/api/v0/authorization.php
@@ -1,8 +1,6 @@
 <?php
 defined($security_key) or exit;
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+
 //------------------------------------------
 // Get user_details
 //------------------------------------------
diff --git a/api/v0/get/authorization.php b/api/v0/get/authorization.php
index 2eb2a17..2e49d10 100644
--- a/api/v0/get/authorization.php
+++ b/api/v0/get/authorization.php
@@ -1,8 +1,6 @@
 <?php
 defined($security_key) or exit;
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+
 //------------------------------------------
 // Get user_details
 //------------------------------------------
diff --git a/api/v0/post/application.php b/api/v0/post/application.php
index 0fb0adb..4be6e88 100644
--- a/api/v0/post/application.php
+++ b/api/v0/post/application.php
@@ -2,9 +2,6 @@
 //defined($security_key) or exit;
 $request = explode('/', trim($_SERVER['PATH_INFO'],'/'));
 
-ini_set('display_errors', '1');
-ini_set('display_startup_errors', '1');
-error_reporting(E_ALL);
 //------------------------------------------
 // Application related calls
 //------------------------------------------
diff --git a/api/v2/get/billing.php b/api/v2/get/billing.php
index 3ea674c..51326d1 100644
--- a/api/v2/get/billing.php
+++ b/api/v2/get/billing.php
@@ -1,8 +1,6 @@
 <?php
 defined($security_key) or exit;
-ini_set('display_errors', '1');
-    ini_set('display_startup_errors', '1');
-    error_reporting(E_ALL);  
+
 //------------------------------------------
 // contracts_billing
 //------------------------------------------
diff --git a/api/v2/get/products_software.php b/api/v2/get/products_software.php
index 1aec8bc..bea469a 100644
--- a/api/v2/get/products_software.php
+++ b/api/v2/get/products_software.php
@@ -1,10 +1,6 @@
 <?php
 defined($security_key) or exit;
 
-ini_set('display_errors', '1');
-ini_set('display_startup_errors', '1');
-error_reporting(E_ALL);  
-
 //------------------------------------------
 // Products
 //------------------------------------------
diff --git a/communications.php b/communications.php
index 55514ed..a73129f 100644
--- a/communications.php
+++ b/communications.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
diff --git a/equipment_manage.php b/equipment_manage.php
index 82391f0..0d4c82b 100644
--- a/equipment_manage.php
+++ b/equipment_manage.php
@@ -1,8 +1,12 @@
 <?php
 defined(page_security_key) or exit;
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
+
 $page = 'equipment_manage';
 $page_edit = 'equipment_manage_edit';
 //Check if allowed
diff --git a/firmwaretool.php b/firmwaretool.php
index 5c46dcd..09e40cd 100644
--- a/firmwaretool.php
+++ b/firmwaretool.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+  ini_set('display_errors', '1');
+  ini_set('display_startup_errors', '1');
+  error_reporting(E_ALL);  
+}
 
 $page = 'firmwaretool';
 //Check if allowed
diff --git a/histories.php b/histories.php
index e34c79e..1c6e1c8 100644
--- a/histories.php
+++ b/histories.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
diff --git a/history.php b/history.php
index 14d65f2..8db037a 100644
--- a/history.php
+++ b/history.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
diff --git a/login.php b/login.php
index e4fc920..b4e7572 100644
--- a/login.php
+++ b/login.php
@@ -1,7 +1,4 @@
 <?php
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
 
 include './assets/functions.php';
 include './settings/settings.php';
diff --git a/partners.php b/partners.php
index e3d8d14..92ac87b 100644
--- a/partners.php
+++ b/partners.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
diff --git a/products.php b/products.php
index 8c72b16..6ee91d1 100644
--- a/products.php
+++ b/products.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
diff --git a/reset.php b/reset.php
index 8abdaaa..6824bc9 100644
--- a/reset.php
+++ b/reset.php
@@ -1,7 +1,4 @@
 <?php
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
 
 include './assets/functions.php';
 include './settings/settings.php';
diff --git a/servicereports.php b/servicereports.php
index 22e2904..b6eacca 100644
--- a/servicereports.php
+++ b/servicereports.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
diff --git a/users.php b/users.php
index 1bf6efb..3c12fa8 100644
--- a/users.php
+++ b/users.php
@@ -1,9 +1,11 @@
 <?php
 defined(page_security_key) or exit;
 
-//ini_set('display_errors', '1');
-//ini_set('display_startup_errors', '1');
-//error_reporting(E_ALL);
+if (debug && debug_id == $_SESSION['id']){
+    ini_set('display_errors', '1');
+    ini_set('display_startup_errors', '1');
+    error_reporting(E_ALL);  
+}
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';