diff --git a/includes/configure_client.php b/includes/configure_client.php
index 4ee406c0..dbb384e2 100755
--- a/includes/configure_client.php
+++ b/includes/configure_client.php
@@ -95,43 +95,6 @@ function DisplayWPAConfig()
     nearbyWifiStations($networks);
     connectedWifiStations($networks);
 
-?>
+    echo renderTemplate("configure_client", compact("status"));
 
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary"> 
-        <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> <?php echo _("Configure client"); ?></div>
-        <!-- /.panel-heading -->
-        <div class="panel-body">
-          <p><?php $status->showMessages(); ?></p>
-          <h4><?php echo _("Client settings"); ?></h4>
-              <div class="btn-group btn-block">
-              <button type="button" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info js-reload-wifi-stations"><?php echo _("Rescan"); ?></button>
-            </div> 
-
-            <form method="POST" action="?page=wpa_conf" name="wpa_conf_form" class="row">
-                <?php echo CSRFTokenFieldTag() ?>
-              <input type="hidden" name="client_settings" ?>
-              <script>
-                function showPassword(index) {
-                    var x = document.getElementsByName("passphrase"+index)[0];
-                    if (x.type === "password") {
-                        x.type = "text";
-                    } else {
-                        x.type = "password";
-                    }
-                }
-              </script>
-
-              <div class="js-wifi-stations loading-spinner"></div>
-
-          </form>
-        </div><!-- ./ Panel body -->
-    <div class="panel-footer"><?php echo _("<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?></div>
-      </div><!-- /.panel-primary -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-<?php
 }
-
-?>
diff --git a/templates/configure_client.php b/templates/configure_client.php
new file mode 100644
index 00000000..c812d6e9
--- /dev/null
+++ b/templates/configure_client.php
@@ -0,0 +1,34 @@
+<div class="row">
+  <div class="col-lg-12">
+    <div class="panel panel-primary">
+      <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> <?php echo _("Configure client"); ?></div>
+      <!-- /.panel-heading -->
+      <div class="panel-body">
+        <p><?php $status->showMessages(); ?></p>
+        <h4><?php echo _("Client settings"); ?></h4>
+
+        <div class="btn-group btn-block">
+          <button type="button" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info js-reload-wifi-stations"><?php echo _("Rescan"); ?></button>
+        </div>
+
+        <form method="POST" action="?page=wpa_conf" name="wpa_conf_form" class="row">
+          <?php echo CSRFTokenFieldTag() ?>
+          <input type="hidden" name="client_settings" ?>
+          <div class="js-wifi-stations loading-spinner"></div>
+        </form>
+      </div><!-- ./ Panel body -->
+      <div class="panel-footer"><?php echo _("<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?></div>
+    </div><!-- /.panel-primary -->
+  </div><!-- /.col-lg-12 -->
+</div><!-- /.row -->
+
+<script>
+  function showPassword(index) {
+      var x = document.getElementsByName("passphrase"+index)[0];
+      if (x.type === "password") {
+          x.type = "text";
+      } else {
+          x.type = "password";
+      }
+  }
+</script>