diff --git a/includes/configure_client.php b/includes/configure_client.php
index 7121ad753..f13f69173 100755
--- a/includes/configure_client.php
+++ b/includes/configure_client.php
@@ -203,7 +203,7 @@ function DisplayWPAConfig(){
               <?php if (array_key_exists('priority', $network)) { ?>
                   <input type="hidden" name="priority<?php echo $index ?>" value="<?php echo htmlspecialchars($network['priority'], ENT_QUOTES); ?>" />
               <?php } ?>
-                  <input type="hidden" name="protocol<?php echo $index ?>" value="<?php echo htmlspecialchars($network['protocol'], ENT_QUOTES); ?>" /><?php echo htmlspecialchars($network['protocol'], ENT_QUOTES); ?>
+                  <input type="hidden" name="protocol<?php echo $index ?>" value="<?php echo htmlspecialchars($network['protocol'], ENT_QUOTES); ?>" /><?php echo $network['protocol']; ?>
                 </td>
               <?php if ($network['protocol'] === 'Open') { ?>
                 <td><input type="hidden" name="passphrase<?php echo $index ?>" value="" />---</td>
diff --git a/includes/functions.php b/includes/functions.php
index 98a2d691f..8e4050f53 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -175,9 +175,9 @@ function ConvertToSecurity( $security ) {
       $protocol = $protocol_match[1];
       $matchArr = explode('-', $match);
       if (count($matchArr) > 2) {
-        $options[] = $protocol . ' ('. $matchArr[2] .')';
+        $options[] = htmlspecialchars($protocol . ' ('. $matchArr[2] .')', ENT_QUOTES);
       } else {
-        $options[] = $protocol;
+        $options[] = htmlspecialchars($protocol, ENT_QUOTES);
       }
     }
   }