diff --git a/templates/index.html b/templates/index.html
index cbd230d..e18c031 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,4 +2,6 @@
 {% block title %}Nicola Ellis & Ritherdon Archive{% endblock %}
 {% block content %}
 <h1>Index</h1>
+<a href="/setup">Create Account</a>
+<a href="login">Log-In</a>
 {% endblock %}
diff --git a/templates/user/dashboard.html b/templates/user/dashboard.html
index 75163ab..f15532d 100644
--- a/templates/user/dashboard.html
+++ b/templates/user/dashboard.html
@@ -2,4 +2,17 @@
 {% block title %}Manage you archive.{% endblock %}
 {% block content %}
 <h1>Dashboard</h1>
+<div>
+    {% if roles.logged-in %}
+    <a href="/dashboard">Dashboard</a>
+    <a href="/user/edit">Edit Account</a>
+    <form action="/logout" method="post">
+      <input type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
+      <input type="submit" value="logout">
+    </form>
+    {% else %}
+    <a href="/">Home</a>
+    <a href="/login">Log-in</a>
+    {% endif %}
+  </div>
 {% endblock %}
diff --git a/templates/user/edit.html b/templates/user/edit.html
new file mode 100644
index 0000000..e58fbfa
--- /dev/null
+++ b/templates/user/edit.html
@@ -0,0 +1,19 @@
+{% extends "layouts/default.html" %}
+{% block title%}Edit your accout settings.{%endblock%}
+{% block content %}
+<h2>Edit Account</h2>
+
+<div>
+  <p>Note: Username cannot be changed.</p>
+<form action="/user/edit" method="post">
+  <input type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
+    <label>Display Name</label>
+    <input type="text" name="DISPLAY-NAME" value="{{user.display-name}}">
+    <label>New Password</label>
+    <input type="password" name="NEW-PASSWORD">
+    <label>New Password Check</label>
+    <input type="password" name="PASSWORD-CHECK">
+    <input type="submit" value="Update Account">
+</form>
+</div>
+{% endblock %}
diff --git a/templates/user/log-in.html b/templates/user/log-in.html
new file mode 100644
index 0000000..36a2eae
--- /dev/null
+++ b/templates/user/log-in.html
@@ -0,0 +1,16 @@
+{% extends "layouts/default.html" %}
+{% block title%}Log-in and start doing stuff.{%endblock%}
+{% block content %}
+<h2>Login</h2>
+
+<div>
+<form action="/login" method="post">
+  <input type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
+    <label>Username</label>
+    <input required type="text" name="USERNAME">
+    <label>password</label>
+    <input required type="password" name="PASSWORD">
+    <input type="submit" value="Log-in">
+</form>
+</div>
+{% endblock %}