diff --git a/website/templates/account/login.html b/website/templates/account/login.html
index 5c65587a4..991ced2f7 100644
--- a/website/templates/account/login.html
+++ b/website/templates/account/login.html
@@ -62,7 +62,7 @@ <h3 class="text-center">Login</h3>
           <input class="form-control" type="text" id="id_login" name="login" placeholder="Username">
           <span class="help-block">{{ form.login.errors }}</span>
         </div>
-        <div class="form-group inner-addon left-addon {% if form.password1.errors %}has-error{% endif %}">
+        <div class="form-group inner-addon left-addon {% if form.password.errors %}has-error{% endif %}">
           <i class="glyphicon glyphicon-lock"></i>
           <input class="form-control login-field" type="password" id="id_password" name="password" placeholder="Password">
           <span class="help-block">{{ form.password.errors }}</span>
diff --git a/website/templates/account/password_change.html b/website/templates/account/password_change.html
new file mode 100644
index 000000000..a1950d27a
--- /dev/null
+++ b/website/templates/account/password_change.html
@@ -0,0 +1,45 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block style %}
+.inner-addon { 
+  position: relative; 
+}
+.inner-addon .glyphicon {
+  position: absolute;
+  padding: 10px;
+  pointer-events: none;
+}
+.left-addon .glyphicon  { left:  0px;}
+.right-addon .glyphicon { right: 0px;}
+.left-addon input  { padding-left:  30px; }
+.right-addon input { padding-right: 30px; }
+{% endblock %}
+
+{% block content %}
+	<div class="row">
+		<h1 class="text-center">{% trans "Change Password" %}</h1>
+		<div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4">
+			<form method="POST" action="{% url 'account_change_password' %}" class="password_change">
+		        {% csrf_token %}
+		        <div class="form-group inner-addon left-addon {% if form.password1.errors %}has-error{% endif %}">
+                    <i class="glyphicon glyphicon-lock"></i>
+                    <input class="form-control" type="password" id="id_oldpassword" name="oldpassword" placeholder="Old Password">
+                    <span class="help-block">{{ form.oldpassword.errors }}</span>
+                </div>
+		        <div class="form-group inner-addon left-addon {% if form.password1.errors %}has-error{% endif %}">
+                    <i class="glyphicon glyphicon-lock"></i>
+                    <input class="form-control" type="password" id="id_password1" name="password1" placeholder="New Password">
+                    <span class="help-block">{{ form.password1.errors }}</span>
+                </div>
+                <div class="form-group inner-addon left-addon {% if form.password2.errors %}has-error{% endif %}">
+                    <i class="glyphicon glyphicon-lock"></i>
+                    <input class="form-control" type="password" id="id_password2" name="password2" placeholder="Confirm Password">
+                    <span class="help-block">{{ form.password2.errors }}</span>
+                </div>
+		        <button type="submit" class="btn btn-success pull-right" name="action">{% trans "Change Password" %}</button>
+		    </form>
+		</div>
+	</div>    
+{% endblock %}
\ No newline at end of file
diff --git a/website/templates/account/password_reset.html b/website/templates/account/password_reset.html
new file mode 100644
index 000000000..7a5a5ea1a
--- /dev/null
+++ b/website/templates/account/password_reset.html
@@ -0,0 +1,42 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block style %}
+.inner-addon {
+    position: relative; 
+}
+.inner-addon .glyphicon {
+  position: absolute;
+  padding: 10px;
+  pointer-events: none;
+}
+.left-addon .glyphicon  { left:  0px;}
+.right-addon .glyphicon { right: 0px;}
+.left-addon input  { padding-left:  30px; }
+.right-addon input { padding-right: 30px; }
+{% endblock %}
+
+{% block content %}    
+    {% if user.is_authenticated %}
+    {% include "account/snippets/already_logged_in.html" %}
+    {% endif %}
+
+    <div class="row">
+        <h1 class="text-center">{% trans "Password Reset" %}</h1>
+        <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4">
+            <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
+
+            <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
+                {% csrf_token %}
+                <div class="form-group inner-addon left-addon {% if form.email.errors %}has-error{% endif %}">
+                    <i class="glyphicon glyphicon-envelope"></i>
+                    <input class="form-control" type="email" id="id_email" name="email" placeholder="Email">
+                    <span class="help-block">{{ form.email.errors }}</span>
+                </div>
+                <input type="submit" class="btn btn-primary pull-right" value="{% trans 'Reset My Password' %}" />
+            </form>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/website/templates/account/password_reset_from_key.html b/website/templates/account/password_reset_from_key.html
new file mode 100644
index 000000000..e412839fd
--- /dev/null
+++ b/website/templates/account/password_reset_from_key.html
@@ -0,0 +1,60 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block style %}
+.inner-addon { 
+    position: relative; 
+}
+.inner-addon .glyphicon {
+  position: absolute;
+  padding: 10px;
+  pointer-events: none;
+}
+.left-addon .glyphicon  { left:  0px;}
+.right-addon .glyphicon { right: 0px;}
+.left-addon input  { padding-left:  30px; }
+.right-addon input { padding-right: 30px; }
+{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <h1 class="text-center">
+            {% if token_fail %}
+                {% trans "Bad Token" %}
+            {% else %}
+                {% trans "Change Password" %}
+            {% endif %}
+        </h1>
+        <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4">
+            {% if token_fail %}
+                {% url 'account_reset_password' as passwd_reset_url %}
+                <p>
+                    {% blocktrans %}
+                    The password reset link was invalid, possibly because it has already been used.
+                    <a href="{{ passwd_reset_url }}">Try again</a>.
+                    {% endblocktrans %}
+                </p>
+            {% else %}
+                {% if form %}
+                    <form method="POST" action="{{ action_url }}">
+                        {% csrf_token %}
+                        <div class="form-group inner-addon left-addon {% if form.password1.errors %}has-error{% endif %}">
+                            <i class="glyphicon glyphicon-lock"></i>
+                            <input class="form-control" type="password" id="id_password1" name="password1" placeholder="Password">
+                            <span class="help-block">{{ form.password1.errors }}</span>
+                        </div>
+                        <div class="form-group inner-addon left-addon {% if form.password2.errors %}has-error{% endif %}">
+                            <i class="glyphicon glyphicon-lock"></i>
+                            <input class="form-control" type="password" id="id_password2" name="password2" placeholder="Confirm Password">
+                            <span class="help-block">{{ form.password2.errors }}</span>
+                        </div>
+                        <input type="submit" class="btn btn-primary pull-right" name="action" value="{% trans 'Change Password' %}"/>
+                    </form>
+                {% else %}
+                    <p>{% trans 'Your password is now changed!' %}</p>
+                {% endif %}
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/website/templates/base.html b/website/templates/base.html
index 9b02774a8..ab8630b75 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -207,63 +207,48 @@
                 </div>
             </div>
 
-            <div class="container">
-                
-                <!--<div class="panel-footer">
-                    <ul>
-                        <li><a href="/terms">Terms of Service</a></li>
-                        <li><a href="http://github.com/bugheist/website" target="_new">Source</a></li>
-                        <li><a href="/stats">Stats</a></li>
-                        <li><a href="/scoreboard">Company Scoreboard</a></li>
-                        <li><a href="http://twitter.com/bugheist" target="_new">Follow us on Twitter</a></li>
-                        <li><a href="http://facebook.com/bugheist" target="_new">Like us on Facebook</a></li>
-                        <li><a href="https://www.owasp.org/index.php/OWASP_Bug_Logging_Tool" target="_new">Powered by OWASP BLT</a></li>
-                        <li><a href="/about" target="_new">About</a></li>
-                    </ul>
-                </div>-->
-                <br>
-                <br>
-                <footer id="myFooter">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-sm-3">
-                                <center><a href="#"> <img src ="{% static "img/logo.png" %}"></a></center>
-                            </div>
-                            <div class="col-sm-3">
-                                <ul>
-                                    <li><a href="/about" target="_new">About</a></li>
-                                    <li><a href="/stats">Stats</a></li>
-                                    <li><a href="http://github.com/bugheist/website" target="_new">Source</a></li>
-                                </ul>
-                            </div>
-                            <div class="col-sm-3">
-                                <ul>
-                                    <li><a href="/scoreboard" target="_new">Company Scoreboard</a></li>
-                                    <li><a href="/terms">Terms of Service</a></li>
-                                    <!-- a space for another option<li><a href="#">Reviews</a></li>-->
-                                </ul>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="social-networks">
-                                    <a href="http://twitter.com/bugheist" target="_new"><i class="fa fa-twitter"></i></a>
-                                    <a href="http://facebook.com/bugheist" target="_new"><i class="fa fa-facebook"></i></a>
-                                </div>
+            <footer id="myFooter">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-sm-3">
+                            <center><a href="#"> <img src ="{% static "img/logo.png" %}"></a></center>
+                        </div>
+                        <div class="col-sm-3">
+                            <ul>
+                                <li><a href="/about" target="_new">About</a></li>
+                                <li><a href="/stats">Stats</a></li>
+                                <li><a href="http://github.com/bugheist/website" target="_new">Source</a></li>
+                            </ul>
+                        </div>
+                        <div class="col-sm-3">
+                            <ul>
+                                <li><a href="/scoreboard" target="_new">Company Scoreboard</a></li>
+                                <li><a href="/terms">Terms of Service</a></li>
+                                <!-- a space for another option<li><a href="#">Reviews</a></li>-->
+                            </ul>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="social-networks">
+                                <a href="http://twitter.com/bugheist" target="_new"><i class="fa fa-twitter"></i></a>
+                                <a href="http://facebook.com/bugheist" target="_new"><i class="fa fa-facebook"></i></a>
                             </div>
                         </div>
                     </div>
-                    <div class="footer-blt">
-                        <a href="https://www.owasp.org/index.php/OWASP_Bug_Logging_Tool" target="_new"><p>Powered by OWASP Bug Logging Tool</p>
-                        </a>
-                    </div>
-                </footer>
-                
-            </div>
+                </div>
+                <div class="footer-blt">
+                    <a href="https://www.owasp.org/index.php/OWASP_Bug_Logging_Tool" target="_new"><p>Powered by OWASP Bug Logging Tool</p>
+                    </a>
+                </div>
+            </footer>
+
             <script src="{% static "vendor/bootstrap/js/bootstrap.min.js" %}"></script>
             {% block after_js %}
             {% endblock %}
             {% if messages %}
                 {% for message in messages %}
-                    <script> $.notify("{{ message }}",{ position: 'top center', className: "{{message.level_tag }}" }); </script>
+                    <script>
+                        $.notify("{{ message }}",{ position: 'top center', className: "{{message.level_tag }}" });
+                    </script>
                 {% endfor %}
             {% endif %}
             <script src="{% static 'js/ui.js' %}"></script>
@@ -275,12 +260,11 @@
             </script>
             <script>
             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-             -              (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-             -              m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-             -              })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-             -
-             -              ga('create', 'UA-66634107-1', 'auto');
-             -              ga('send', 'pageview');
+             (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+             m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+             })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+             ga('create', 'UA-66634107-1', 'auto');
+             ga('send', 'pageview');
             </script>
         </div>
     </body>