diff --git a/pagure/templates/login/password_recover.html b/pagure/templates/login/password_recover.html
index 57d9f92..a61a452 100644
--- a/pagure/templates/login/password_recover.html
+++ b/pagure/templates/login/password_recover.html
@@ -1,25 +1,34 @@
 {% extends "master.html" %}
-{% from "_formhelper.html" import render_field_in_row %}
+{% from "_formhelper.html" import render_bootstrap_field %}
 
 {% 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>
+<div class="container">
+  <div class="row">
+    <div class="col-md-8 col-md-offset-2">
+      <div class="card m-t-3">
+        <div class="card-header">
+            <strong>Change password</strong>
+        </div>
+        <form action="{{ url_for('change_password', username=g.fas_user.username) }}" method="POST">
+            <table>
+                {{ render_bootstrap_field(form.old_password) }}
+                {{ render_bootstrap_field(form.password) }}
+                {{ render_bootstrap_field(form.confirm_password) }}
+            </table>
+            <p class="buttons indent">
+                <input type="submit" class="submit positive button"  class="btn btn-primary" value="Update">
+                <a href="{{ url_for('index') }}">
+                    <input type="button" value="Cancel" class="button" class="btn btn-secondary">
+                </a>
+                {{ form.csrf_token }}
+            </p>
+        </form>
+     </div>
+   </div>
+  </div>
+</div>
 
 {% endblock %}
diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html
index bcd9528..0ff9e40 100644
--- a/pagure/templates/user_settings.html
+++ b/pagure/templates/user_settings.html
@@ -38,7 +38,6 @@
 
 
 {% block content %}
-<<<<<<< HEAD
 <div class="container p-t-3">
   <div class="col-md-8 col-md-offset-2">
     <div class="card m-b-3">
@@ -65,26 +64,6 @@
             </a>
       </div>
       <div class="list-group list-group-flush">
-=======
-<section class="user_settings">
-    <header>
-        <h2>{{ user.user }}'s settings</h2>
-    </header>
-    <table>
-      <tr>
-        <th>Full name</th>
-        <td> {{ user.fullname }} </td>
-      </tr>
-      <tr>
-        <td>
-            {% if config.get('PAGURE_AUTH')=='local' %}
-                <a href="{{ url_for('change_password', username=g.fas_user.username) }}">Change password</a>
-            {% endif %}
-        </td>
-     </tr>
-      <tr>
-        <th>Emails</th>
->>>>>>> Add a change password link for local auth
         {% for email in user.emails %}
           {{ render_email(email, form) }}
         {% endfor %}
@@ -109,7 +88,12 @@
         </form>
       </div>
     </div>
-
+    <div class="card m-b-3">
+        {% if config.get('PAGURE_AUTH')=='local' %}
+            <a href="{{ url_for('change_password', username=g.fas_user.username) }}">Change password</a>
+        {% endif %}
+    </div>
   </div>
 </div>
+
 {% endblock %}
diff --git a/pagure/ui/login.py b/pagure/ui/login.py
index d32b340..de925c0 100644
--- a/pagure/ui/login.py
+++ b/pagure/ui/login.py
@@ -45,7 +45,7 @@ def new_user():
             flask.flash('Email address already taken.', 'error')
             return flask.redirect(flask.request.url)
 
-        password = bcrypt.hashpw(form.password.data, bcrypt.gensalt())
+        password = bcrypt.hashpw(str(form.password.data), bcrypt.gensalt())
         form.password.data = password
 
         token = pagure.lib.login.id_generator(40)
@@ -100,17 +100,20 @@ def do_login():
         username = form.username.data
 
         user_obj = pagure.lib.search_user(SESSION, username=username)
-        password = bcrypt.hashpw(form.password.data, user_obj.password)
+        try:
+            password = bcrypt.hashpw(str(form.password.data), user_obj.password)
+        except ValueError:
+             password = '%s%s' % (form.password.data, APP.config.get('PASSWORD_SEED', None))
+             password = hashlib.sha512(password).hexdigest()
 
         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:
             flask.flash(
                 'Invalid user, did you confirm the creation with the url '
-                'provided by email?', 'error')
-            return flask.redirect(flask.url_for('auth_login'))
+               'provided by email?', 'error')
+           return flask.redirect(flask.url_for('auth_login'))
         else:
             visit_key = pagure.lib.login.id_generator(40)
             now = datetime.datetime.utcnow()
@@ -232,7 +235,7 @@ def reset_password(token):
 
     if form.validate_on_submit():
 
-        user_obj.password = bcrypt.hashpw(form.password.data, bcrypt.gensalt())
+        user_obj.password = bcrypt.hashpw(str(form.password.data), bcrypt.gensalt())
         user_obj.token = None
         SESSION.add(user_obj)
 
@@ -271,9 +274,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 = bcrypt.hashpw(form.old_password.data, user_obj.password)
+        old_password = bcrypt.hashpw(str(orm.old_password.data), user_obj.password)
         if user_obj.password == old_password:
-            user_obj.password = bcrypt.hashpw(form.password.data, bcrypt.gensalt())
+            user_obj.password = bcrypt.hashpw(str(form.password.data), bcrypt.gensalt())
             SESSION.add(user_obj)
 
         try:
diff --git a/requirements.txt b/requirements.txt
index 82074eb..c65e4df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,3 +26,4 @@ sqlalchemy >= 0.8
 straight.plugin==1.4.0-post-1
 trollius-redis
 wtforms
+bcrypt