diff --git a/public/templates/bootstrap/login/default.tpl b/public/templates/bootstrap/login/default.tpl
index 91ffb27e..addfe1e4 100644
--- a/public/templates/bootstrap/login/default.tpl
+++ b/public/templates/bootstrap/login/default.tpl
@@ -17,7 +17,8 @@
       </div>
       <div class="panel-footer">
         <input type="submit" class="btn btn-success" value="Login" >
+        <a href="{$smarty.server.SCRIPT_NAME}?page=password"><font size="1">Forgot your password?</font></a>
       </div>
     </div>
   </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/public/templates/bootstrap/password/default.tpl b/public/templates/bootstrap/password/default.tpl
index 85ad3704..7abf2c5c 100644
--- a/public/templates/bootstrap/password/default.tpl
+++ b/public/templates/bootstrap/password/default.tpl
@@ -1,21 +1,23 @@
-<article class="module width_half">
-  <form action="" method="POST">
+<div class="row">
+  <form class="col-md-4" role="form" method="POST">
     <input type="hidden" name="page" value="password">
     <input type="hidden" name="action" value="reset">
     <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
-    <header><h3>Password reset</h3></header>
-    <div class="module_content">
-      <p>If you have an email set for your account, enter your username to get your password reset</p>
-      <fieldset>
-        <label>Username or E-Mail</label>
-        <input type="text" name="username" value="{$smarty.post.username|escape|default:""}" size="22" maxlength="100" required>
-      </fieldset>
-      <div class="clear"></div>
-    </div>
-    <footer>
-      <div class="submit_link">
-        <input type="submit" value="Reset" class="alt_btn">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h3 class="panel-title">Password reset</h3>
       </div>
-    </footer>
+      <div class="panel-body">
+        <fieldset>
+         <p>If you have an email set for your account, enter your username to get your password reset</p>
+          <div class="form-group">
+            <input class="form-control" placeholder="Username or E-mail" name="username" type="text" maxlength="100" autofocus required>
+          </div>
+        </fieldset>
+      </div>
+      <div class="panel-footer">
+        <input type="submit" class="btn btn-success" value="Reset" >
+      </div>
+    </div>
   </form>
-</article>
+</div>