diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 178a18477..a499ae2e9 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -116,7 +116,7 @@ class ConfigFile
 
     /**
      * Returns PMA_Config without user preferences applied
-     * 
+     *
      * @return PMA_Config
      */
     public function getOrgConfigObj()
@@ -422,10 +422,10 @@ class ConfigFile
         }
         $verbose = $this->get("Servers/$id/verbose");
         if (!empty($verbose)) {
-            return htmlspecialchars($verbose);
+            return $verbose;
         }
         $host = $this->get("Servers/$id/host");
-        return empty($host) ? 'localhost' : htmlspecialchars($host);
+        return empty($host) ? 'localhost' : $host;
     }
 
     /**
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 149918c76..4a7eea65e 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -279,6 +279,7 @@ function perform_config_checks()
         if ($server_name == 'localhost') {
             $server_name .=  " [$i]";
         }
+        $server_name = htmlspecialchars($server_name);
 
         if ($cookie_auth_server && $blowfish_secret === null) {
             $blowfish_secret = uniqid('', true);