diff --git a/pagure/templates/login/password_change.html b/pagure/templates/login/password_change.html
index 26a5836..bef3946 100644
--- a/pagure/templates/login/password_change.html
+++ b/pagure/templates/login/password_change.html
@@ -1,7 +1,6 @@
 {% extends "master.html" %}
 {% from "_formhelper.html" import render_bootstrap_field %}
 
-<<<<<<< HEAD
 {% block title %}Lost password{% endblock %}
 {% set tag = "home" %}
 
@@ -26,27 +25,5 @@
     </div>
   </div>
 </div>
-=======
-{% block title %}Change password{% endblock %}
-{%block tag %}home{% endblock %}
-
-{% block content %}
-<h2>Change password</h2>
-
-<form action="{{ url_for('change_password', username=g.fas_user.username) }}" method="POST">
-  <table>
-    {{ render_field_in_row(form.old_password) }}
-    {{ render_field_in_row(form.password) }}
-    {{ render_field_in_row(form.confirm_password) }}
-  </table>
-  <p class="buttons indent">
-    <input type="submit" class="submit positive button" value="Update">
-    <a href="{{ url_for('index') }}">
-      <input type="button" value="Cancel" class="button">
-    </a>
-    {{ form.csrf_token }}
-  </p>
-</form>
->>>>>>> Add a change password link for local auth
 
 {% endblock %}
diff --git a/pagure/templates/login/password_recover.html b/pagure/templates/login/password_recover.html
new file mode 100644
index 0000000..57d9f92
--- /dev/null
+++ b/pagure/templates/login/password_recover.html
@@ -0,0 +1,25 @@
+{% extends "master.html" %}
+{% from "_formhelper.html" import render_field_in_row %}
+
+{% block title %}Change password{% endblock %}
+{%block tag %}home{% endblock %}
+
+{% block content %}
+<h2>Change password</h2>
+
+<form action="{{ url_for('change_password', username=g.fas_user.username) }}" method="POST">
+  <table>
+    {{ render_field_in_row(form.old_password) }}
+    {{ render_field_in_row(form.password) }}
+    {{ render_field_in_row(form.confirm_password) }}
+  </table>
+  <p class="buttons indent">
+    <input type="submit" class="submit positive button" value="Update">
+    <a href="{{ url_for('index') }}">
+      <input type="button" value="Cancel" class="button">
+    </a>
+    {{ form.csrf_token }}
+  </p>
+</form>
+
+{% endblock %}
diff --git a/pagure/templates/master.html b/pagure/templates/master.html
index 1d928c5..b08fbf9 100644
--- a/pagure/templates/master.html
+++ b/pagure/templates/master.html
@@ -78,7 +78,7 @@
               </a>
             </li>
             {% endif %}
-          {% endif %}
+         {% endif %}
         </ul>
       </div>
     </nav>
diff --git a/pagure/ui/login.py b/pagure/ui/login.py
index ede0308..d32b340 100644
--- a/pagure/ui/login.py
+++ b/pagure/ui/login.py
@@ -12,6 +12,7 @@
 import hashlib
 import datetime
 import urlparse
+import bcrypt
 
 import flask
 from sqlalchemy.exc import SQLAlchemyError
@@ -44,9 +45,8 @@ def new_user():
             flask.flash('Email address already taken.', 'error')
             return flask.redirect(flask.request.url)
 
-        password = '%s%s' % (
-            form.password.data, APP.config.get('PASSWORD_SEED', None))
-        form.password.data = hashlib.sha512(password).hexdigest()
+        password = bcrypt.hashpw(form.password.data, bcrypt.gensalt())
+        form.password.data = password
 
         token = pagure.lib.login.id_generator(40)
 
@@ -98,12 +98,12 @@ def do_login():
 
     if form.validate_on_submit():
         username = form.username.data
-        password = '%s%s' % (
-            form.password.data, APP.config.get('PASSWORD_SEED', None))
-        password = hashlib.sha512(password).hexdigest()
 
         user_obj = pagure.lib.search_user(SESSION, username=username)
+        password = bcrypt.hashpw(form.password.data, user_obj.password)
+
         if not user_obj or user_obj.password != password:
+            print user_obj.password, password
             flask.flash('Username or password invalid.', 'error')
             return flask.redirect(flask.url_for('auth_login'))
         elif user_obj.token:
@@ -232,9 +232,7 @@ def reset_password(token):
 
     if form.validate_on_submit():
 
-        password = '%s%s' % (
-            form.password.data, APP.config.get('PASSWORD_SEED', None))
-        user_obj.password = hashlib.sha512(password).hexdigest()
+        user_obj.password = bcrypt.hashpw(form.password.data, bcrypt.gensalt())
         user_obj.token = None
         SESSION.add(user_obj)
 
@@ -273,12 +271,9 @@ def change_password(username):
         flask.flash('No user associated with this username.', 'error')
         return flask.redirect(flask.url_for('auth_login'))
     if form.validate_on_submit():
-        old_password = '%s%s' % (
-            form.old_password.data, APP.config.get('PASSWORD_SEED', None))
-        if user_obj.password == hashlib.sha512(old_password).hexdigest():
-            password = '%s%s' % (
-                form.password.data, APP.config.get('PASSWORD_SEED', None))
-            user_obj.password = hashlib.sha512(password).hexdigest()
+        old_password = bcrypt.hashpw(form.old_password.data, user_obj.password)
+        if user_obj.password == old_password:
+            user_obj.password = bcrypt.hashpw(form.password.data, bcrypt.gensalt())
             SESSION.add(user_obj)
 
         try:
@@ -295,7 +290,7 @@ def change_password(username):
         return flask.redirect(flask.url_for('auth_login'))
 
     return flask.render_template(
-        'login/password_change.html',
+        'login/password_recover.html',
         form=form,
         username=username,
     )