diff --git a/app/templates/auth/change_password.html b/app/templates/auth/change_password.html
new file mode 100644
index 0000000..b085405
--- /dev/null
+++ b/app/templates/auth/change_password.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
+
+{% block app_content %}
+<div class="row">
+    <div class="col-xs-0 col-md-1"></div>
+        <div class="col-xs-8 col-md-4">
+            {% if current_user.password_hash %}
+            <h1>Change Password</h1>
+            {% else %}
+            <h1>Set Password</h1>
+            {% endif %}
+            {{ wtf.quick_form(form, button_map={'submit': 'primary'}) }}
+            <br>
+        </div>
+    <div class="col-xs-0 col-md-7"></div>
+</div>
+{% endblock %}
diff --git a/app/templates/user_profile.html b/app/templates/user_profile.html
new file mode 100644
index 0000000..998952c
--- /dev/null
+++ b/app/templates/user_profile.html
@@ -0,0 +1,6 @@
+{% extends 'base.html' %}
+
+{% block app_content %}
+<h1>My Profile</h1>
+<a href="{{ url_for('auth.change_password') }}"><button class="btn btn-primary">Change Password</button></a>
+{% endblock %}
\ No newline at end of file