diff --git a/html/includes/vars.inc.php b/html/includes/vars.inc.php
index 369a13a74..8d3c3b6c2 100644
--- a/html/includes/vars.inc.php
+++ b/html/includes/vars.inc.php
@@ -7,7 +7,7 @@ foreach ($_GET as $key => $get_var) {
             $value = 'yes';
         }
 
-        $vars[$name] = $value;
+        $vars[$name] = htmlentities($value);
     }
 }
 
@@ -23,7 +23,7 @@ else {
 foreach ($segments as $pos => $segment) {
     $segment = urldecode($segment);
     if ($pos == '0') {
-        $vars['page'] = $segment;
+        $vars['page'] =htmlentities( $segment);
     }
     else {
         list($name, $value) = explode('=', $segment);
@@ -31,15 +31,15 @@ foreach ($segments as $pos => $segment) {
             $vars[$name] = yes;
         }
         else {
-            $vars[$name] = $value;
+            $vars[$name] = htmlentities($value);
         }
     }
 }
 
 foreach ($_GET as $name => $value) {
-    $vars[$name] = $value;
+    $vars[$name] = htmlentities($value);
 }
 
 foreach ($_POST as $name => $value) {
-    $vars[$name] = $value;
+    $vars[$name] = htmlentities($value);
 }
diff --git a/html/index.php b/html/index.php
index 46164c663..494d6c3de 100644
--- a/html/index.php
+++ b/html/index.php
@@ -214,14 +214,6 @@ else {
     <div class="col-md-12">
 <?php
 
-// To help debug the new URLs :)
-if (isset($devel) || isset($vars['devel'])) {
-    echo("<pre>");
-    print_r($_GET);
-    print_r($vars);
-    echo("</pre>");
-}
-
 if ($_SESSION['authenticated']) {
     // Authenticated. Print a page.
     if (isset($vars['page']) && !strstr("..", $vars['page']) &&  is_file("pages/" . $vars['page'] . ".inc.php")) {