diff --git a/html/ajax_form.php b/html/ajax_form.php
index 999a43a4dc..93c8498f66 100644
--- a/html/ajax_form.php
+++ b/html/ajax_form.php
@@ -21,6 +21,7 @@ require_once '../includes/definitions.inc.php';
 require_once 'includes/functions.inc.php';
 require_once '../includes/functions.php';
 require_once 'includes/authenticate.inc.php';
+require_once 'includes/vars.inc.php';
 
 if (!$_SESSION['authenticated']) {
     echo 'unauthenticated';
diff --git a/html/includes/forms/create-service.inc.php b/html/includes/forms/create-service.inc.php
index e2e20a1700..e92dbadbac 100644
--- a/html/includes/forms/create-service.inc.php
+++ b/html/includes/forms/create-service.inc.php
@@ -16,12 +16,12 @@ if (is_admin() === false) {
     die('ERROR: You need to be admin');
 }
 
-$service_id = $_POST['service_id'];
-$type = mres($_POST['stype']);
-$desc = mres($_POST['desc']);
-$ip = mres($_POST['ip']);
-$param = mres($_POST['param']);
-$device_id = mres($_POST['device_id']);
+$service_id = $vars['service_id'];
+$type = mres($vars['stype']);
+$desc = mres($vars['desc']);
+$ip = mres($vars['ip']);
+$param = mres($vars['param']);
+$device_id = mres($vars['device_id']);
 
 if (is_numeric($service_id) && $service_id > 0) {
     // Need to edit.
diff --git a/html/includes/forms/delete-service.inc.php b/html/includes/forms/delete-service.inc.php
index fc1f1e8ee4..65da3381c7 100644
--- a/html/includes/forms/delete-service.inc.php
+++ b/html/includes/forms/delete-service.inc.php
@@ -15,15 +15,15 @@ if (is_admin() === false) {
     $status = array('status' =>1, 'message' => 'ERROR: You need to be admin to delete services');
 }
 else {
-    if (!is_numeric($_POST['service_id'])) {
+    if (!is_numeric($vars['service_id'])) {
         $status = array('status' =>1, 'message' => 'No Service has been selected');
     }
     else {
-        if (service_delete($_POST['service_id'])) {
-            $status = array('status' =>0, 'message' => 'Service: <i>'.$_POST['service_id'].', has been deleted.</i>');
+        if (service_delete($vars['service_id'])) {
+            $status = array('status' =>0, 'message' => 'Service: <i>'.$vars['service_id'].', has been deleted.</i>');
         }
         else {
-            $status = array('status' =>1, 'message' => 'Service: <i>'.$_POST['service_id'].', has NOT been deleted.</i>');
+            $status = array('status' =>1, 'message' => 'Service: <i>'.$vars['service_id'].', has NOT been deleted.</i>');
         }
     }
 }
diff --git a/html/includes/forms/parse-service.inc.php b/html/includes/forms/parse-service.inc.php
index f5a1bbb5ef..a421e1a93a 100644
--- a/html/includes/forms/parse-service.inc.php
+++ b/html/includes/forms/parse-service.inc.php
@@ -16,7 +16,7 @@ if (is_admin() === false) {
     die('ERROR: You need to be admin');
 }
 
-$service_id = $_POST['service_id'];
+$service_id = $vars['service_id'];
 
 if (is_numeric($service_id) && $service_id > 0) {
     $service = service_get(null, $service_id);
diff --git a/html/pages/addsrv.inc.php b/html/pages/addsrv.inc.php
index e0df8f3132..db6b988aec 100644
--- a/html/pages/addsrv.inc.php
+++ b/html/pages/addsrv.inc.php
@@ -4,11 +4,11 @@ if ($_SESSION['userlevel'] < '10') {
     include 'includes/error-no-perm.inc.php';
 }
 else {
-    if ($_POST['addsrv']) {
+    if ($vars['addsrv']) {
         if ($_SESSION['userlevel'] >= '10') {
             $updated = '1';
 
-            $service_id = service_add($_POST['device'], $_POST['type'], $_POST['descr'], $_POST['ip'], $_POST['params'], 0);
+            $service_id = service_add($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
             if ($service_id) {
                 $message       .= $message_break.'Service added ('.$service_id.')!';
                 $message_break .= '<br />';
diff --git a/html/pages/device/edit/services.inc.php b/html/pages/device/edit/services.inc.php
index 7ca26baa07..6aa4a0e3e0 100644
--- a/html/pages/device/edit/services.inc.php
+++ b/html/pages/device/edit/services.inc.php
@@ -1,11 +1,11 @@
 <?php
 
 if (is_admin() === true || is_read() === true) {
-    if ($_POST['addsrv']) {
+    if ($vars['addsrv']) {
         if ($_SESSION['userlevel'] >= '10') {
             $updated = '1';
 
-            $service_id = service_add($_POST['device'], $_POST['type'], $_POST['descr'], $_POST['ip'], $_POST['params'], 0);
+            $service_id = service_add($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
             if ($service_id) {
                 $message       .= $message_break.'Service added ('.$service_id.')!';
                 $message_break .= '<br />';