diff --git a/libs/configuration_app/app.py b/libs/configuration_app/app.py
index 60c15605..677a42fb 100644
--- a/libs/configuration_app/app.py
+++ b/libs/configuration_app/app.py
@@ -12,7 +12,9 @@
 @app.route('/')
 def index():
     wifi_ap_array = scan_wifi_networks()
-    return render_template('app.html', wifi_ap_array = wifi_ap_array)
+    config_hash = config_file_hash()
+
+    return render_template('app.html', wifi_ap_array = wifi_ap_array, config_hash = config_hash)
 
 
 @app.route('/manual_ssid_entry')
diff --git a/libs/configuration_app/static/stylesheets/app.css b/libs/configuration_app/static/stylesheets/app.css
index 4a200560..c4a86602 100644
--- a/libs/configuration_app/static/stylesheets/app.css
+++ b/libs/configuration_app/static/stylesheets/app.css
@@ -40,6 +40,19 @@ div#mainContent form {
     margin-top:-2em;
 }
 
+div#wpaStatus{
+    padding: 4px;
+    margin: 0 0 10px 0;
+    width: 250px;
+    background-color: #928043;
+    text-align: left;
+    font-size: .3em;
+}
+
+div#wpaStatus a{
+    color: #fff;
+}
+
 label[for=ssid],
 label[for=wifi_key]{
     font-size:1.9rem;
diff --git a/libs/configuration_app/templates/app.html b/libs/configuration_app/templates/app.html
index ed80ad9b..419419bf 100644
--- a/libs/configuration_app/templates/app.html
+++ b/libs/configuration_app/templates/app.html
@@ -2,6 +2,19 @@
 
 {% block body %}
   <div id="mainContent">
+    <div id="wpaStatus">
+      <ul>
+        {% if config_hash['wpa_enabled'] == '1': %}
+          <li><a href="{{ url_for('wpa_settings') }}">Config. Mode WPA: ENABLED</a></li>
+          <li><a href="{{ url_for('wpa_settings') }}">Key: {{ config_hash['wpa_key'] }}</a></li>
+        {% endif %}
+
+        {% if config_hash['wpa_enabled'] == '0': %}
+          <li><a href="{{ url_for('wpa_settings') }}">Config. Mode WPA: DISABLED</a></li>
+      {% endif %}
+      </ul>
+    </div>
+
     <h1>WiFi Setup</h1>
     <div class="wifiIcon"></div>
 
@@ -18,7 +31,6 @@ <h1>WiFi Setup</h1>
         </li>
 
         <li><a href="{{ url_for('manual_ssid_entry') }}" class="manualSSIDEntry">manual SSID entry -></a></li>
-        <li><a href="{{ url_for('wpa_settings') }}" class="manualSSIDEntry">WPA settings></a></li>
 
         <li><label for="wifi_key">Your Wifi password</label></li>
         <li><input type="password" name="wifi_key", class="wifiNetworkInputs"></li>