diff --git a/peach-web/templates/password/change_password.html.tera b/peach-web/templates/password/change_password.html.tera
index 10a01955..f4414a60 100644
--- a/peach-web/templates/password/change_password.html.tera
+++ b/peach-web/templates/password/change_password.html.tera
@@ -2,35 +2,33 @@
 {%- block card %}
       <!-- CHANGE PASSWORD FORM -->
       <div class="card center">
-
         <div class="form-container">
-
-              <form id="changePassword" action="/settings/change_password" method="post">
-              <div class="input-wrapper">
-                <!-- input for old password -->
-                <label id="old_password" class="label-small input-label font-near-black">
-                   <label class="label-small input-label font-gray" for="old_password" style="padding-top: 0.25rem;">Old Password</label>
+          <form id="changePassword" action="/settings/change_password" method="post">
+            <div class="input-wrapper">
+              <!-- input for old password -->
+              <label id="old_password" class="label-small input-label font-near-black">
+                <label class="label-small input-label font-gray" for="old_password" style="padding-top: 0.25rem;">Old Password</label>
                 <input id="old_password" class="form-input"  style="margin-bottom: 0;"
-                    name="old_password" type="password" title="old password" value=""></label>
+                    name="old_password" type="password" title="old password" value="">
+              </label>
+            </div>
 
-              </div>
-
-              <div class="input-wrapper">
-                <!-- input for new password1 -->
-                <label id="new_password1" class="label-small input-label font-near-black">
-                   <label class="label-small input-label font-gray" for="new_password1" style="padding-top: 0.25rem;">Enter New Password</label>
+            <div class="input-wrapper">
+              <!-- input for new password1 -->
+              <label id="new_password1" class="label-small input-label font-near-black">
+                <label class="label-small input-label font-gray" for="new_password1" style="padding-top: 0.25rem;">Enter New Password</label>
                 <input id="new_password1" class="form-input"  style="margin-bottom: 0;"
-                    name="new_password1"  title="new_password1" type="password" value=""></label>
-              </div>
+                    name="new_password1"  title="new_password1" type="password" value="">
+              </label>
+            </div>
 
-               <div class="input-wrapper">
-                <!-- input for new password2 -->
-                <label id="new_password2" class="label-small input-label font-near-black">
-                   <label class="label-small input-label font-gray" for="new_password2" style="padding-top: 0.25rem;">Re-Enter New Password</label>
+            <div class="input-wrapper">
+              <!-- input for new password2 -->
+              <label id="new_password2" class="label-small input-label font-near-black">
+                <label class="label-small input-label font-gray" for="new_password2" style="padding-top: 0.25rem;">Re-Enter New Password</label>
                 <input id="new_password2" class="form-input"  style="margin-bottom: 0;"
-                    name="new_password2"  title="new_password2" type="password" value=""></label>
-              </div>
-
+                    name="new_password2"  title="new_password2" type="password" value="">
+              </label>
             </div>
 
             <div id="buttonDiv">
@@ -39,11 +37,11 @@
             <a class="button button-secondary center" href="/network" title="Cancel">Cancel</a>
           </form>
 
-            <!-- FLASH MESSAGE -->
-           {% include "snippets/flash_message" %}
+          <!-- FLASH MESSAGE -->
+          {% include "snippets/flash_message" %}
 
-           <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
-           {% include "snippets/noscript" %}
+          <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
+          {% include "snippets/noscript" %}
 
         </div>
       </div>
diff --git a/peach-web/templates/password/forgot_password.html.tera b/peach-web/templates/password/forgot_password.html.tera
index fdf66f0a..4cec9891 100644
--- a/peach-web/templates/password/forgot_password.html.tera
+++ b/peach-web/templates/password/forgot_password.html.tera
@@ -2,25 +2,23 @@
 {%- block card %}
       <!--PUBLIC PAGE FOR SENDING A NEW TEMPORARY PASSWORD TO BE USED TO RESET YOUR PASSWORD -->
       <div class="card center">
+        <p class="text-notice" style="width: 80%;  margin:auto; margin-bottom: 35px; margin-top: 20px;">
+          Click the button below to send a new temporary password which can be used to change your device password.
+          <br/><br/>
+          The temporary password will be sent in an SSB private message to the admin of this device.
+        </p>
 
-            <p class="text-notice" style="width: 80%;  margin:auto; margin-bottom: 35px; margin-top: 20px;">
-                Click the button below to send a new temporary password which can be used to change your device password.
-                <br/><br/>
-                The temporary password will be sent in an SSB private message to the admin of this device.
-            </p>
+        <form id="sendPasswordReset" action="/send_password_reset" method="post">
+          <div id="buttonDiv">
+            <input type="submit" class="button center button-secondary" value="Send Password Reset" title="Send Password Reset Link"/>
+          </div>
+        </form>
 
-           <form id="sendPasswordReset" action="/send_password_reset" method="post">
-                <div id="buttonDiv">
-                    <input type="submit" class="button center button-secondary" value="Send Password Reset" title="Send Password Reset Link"/>
-                </div>
-           </form>
-
-           <!-- FLASH MESSAGE -->
-           {% include "snippets/flash_message" %}
-
-           <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
-           {% include "snippets/noscript" %}
+        <!-- FLASH MESSAGE -->
+        {% include "snippets/flash_message" %}
 
+        <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
+        {% include "snippets/noscript" %}
 
         </div>
       </div>
diff --git a/peach-web/templates/password/reset_password.html.tera b/peach-web/templates/password/reset_password.html.tera
index 0d37b296..1e719051 100644
--- a/peach-web/templates/password/reset_password.html.tera
+++ b/peach-web/templates/password/reset_password.html.tera
@@ -2,35 +2,33 @@
 {%- block card %}
       <!-- RESET PASSWORD PAGE -->
       <div class="card center">
-
         <div class="form-container">
-
-              <form id="changePassword" action="/reset_password" method="post">
-              <div class="input-wrapper">
-                <!-- input for temporary password -->
-                <label id="temporary_password" class="label-small input-label font-near-black">
-                   <label class="label-small input-label font-gray" for="temporary_password" style="padding-top: 0.25rem;">Temporary Password</label>
+          <form id="changePassword" action="/reset_password" method="post">
+            <div class="input-wrapper">
+              <!-- input for temporary password -->
+              <label id="temporary_password" class="label-small input-label font-near-black">
+                <label class="label-small input-label font-gray" for="temporary_password" style="padding-top: 0.25rem;">Temporary Password</label>
                 <input id="temporary_password" class="form-input"  style="margin-bottom: 0;"
-                    name="temporary_password" type="password" title="temporary password" value=""></label>
+                    name="temporary_password" type="password" title="temporary password" value="">
+              </label>
+            </div>
 
-              </div>
-
-              <div class="input-wrapper">
-                <!-- input for new password1 -->
-                <label id="new_password1" class="label-small input-label font-near-black">
-                   <label class="label-small input-label font-gray" for="new_password1" style="padding-top: 0.25rem;">Enter New Password</label>
+            <div class="input-wrapper">
+              <!-- input for new password1 -->
+              <label id="new_password1" class="label-small input-label font-near-black">
+                <label class="label-small input-label font-gray" for="new_password1" style="padding-top: 0.25rem;">Enter New Password</label>
                 <input id="new_password1" class="form-input"  style="margin-bottom: 0;"
-                    name="new_password1"  title="new_password1" type="password" value=""></label>
-              </div>
+                    name="new_password1"  title="new_password1" type="password" value="">
+              </label>
+            </div>
 
-               <div class="input-wrapper">
-                <!-- input for new password2 -->
-                <label id="new_password2" class="label-small input-label font-near-black">
-                   <label class="label-small input-label font-gray" for="new_password2" style="padding-top: 0.25rem;">Re-Enter New Password</label>
+            <div class="input-wrapper">
+              <!-- input for new password2 -->
+              <label id="new_password2" class="label-small input-label font-near-black">
+                <label class="label-small input-label font-gray" for="new_password2" style="padding-top: 0.25rem;">Re-Enter New Password</label>
                 <input id="new_password2" class="form-input"  style="margin-bottom: 0;"
-                    name="new_password2"  title="new_password2" type="password" value=""></label>
-              </div>
-
+                    name="new_password2"  title="new_password2" type="password" value="">
+              </label>
             </div>
 
             <div id="buttonDiv">
@@ -38,11 +36,11 @@
             </div>
           </form>
 
-           <!-- FLASH MESSAGE -->
-           {% include "snippets/flash_message" %}
+          <!-- FLASH MESSAGE -->
+          {% include "snippets/flash_message" %}
 
-           <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
-           {% include "snippets/noscript" %}
+          <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
+          {% include "snippets/noscript" %}
 
         </div>
       </div>