diff --git a/public/index.html b/public/index.html
index 35e3f7660da02cd63860a76cc73dc57b92212a31..c881c6dbd3a9af820ddf8d4c41f3ccf06287ffe5 100755
--- a/public/index.html
+++ b/public/index.html
@@ -209,6 +209,13 @@
 <!-- errors will go here -->
 <form id="setup_form" name="setup_form" method="POST" action="submitForm" onsubmit="saveFields()">
     <div id="wifi_section" class="section">
+        <div class="warning">
+            <body>
+                This application does not require or manage Passwords and you are responsible for securing your Gateway. 
+                <br>
+                This application is provided to simplify setting up a WiFi connection in order to speed up development.
+            </body>
+        </div>
         <div class="header">Connect to a WiFi Network</div>
         <table class="content">
             <tr>
diff --git a/public/main.css b/public/main.css
index dc9f558d7cee3c15c7f8375ec50f6eac857fc8fa..9dea1cc643deeb583eb9f6abdc2796941902fe23 100755
--- a/public/main.css
+++ b/public/main.css
@@ -212,4 +212,16 @@ label {
 .cmdout {
     width: 800px;
     resize: none;
+}
+
+.warning {
+    width: 800px;
+    color: red;
+    margin: 0 auto;
+    font-size: 16px;
+    font-weight: 100;
+    padding-bottom: 10px;
+    margin-bottom: 2px;
+    vertical-align: middle;
+    text-align: center;
 }
\ No newline at end of file