diff --git a/quest/events.py b/quest/events.py
index b20bf02..65e1a6f 100644
--- a/quest/events.py
+++ b/quest/events.py
@@ -86,7 +86,7 @@ def message(socket, data):
 	m = Message(
 		quest=quest,
 		message=message)
-	if user.username:
+	if user.is_authenticated:
 		m.user = user
 	m.save()
 
@@ -551,7 +551,7 @@ def vote(socket, data):
 			option=option,
 			ip_address=ip_address
 		)
-		if user.username:
+		if user.is_authenticated:
 			pv.user = user
 		pv.save()
 
diff --git a/quest/jinja2/quest/quest.html b/quest/jinja2/quest/quest.html
index cab74dd..83581ed 100644
--- a/quest/jinja2/quest/quest.html
+++ b/quest/jinja2/quest/quest.html
@@ -18,32 +18,7 @@
 	<script>window.onload = load;</script>
 {% endblock %}
 {% block header %}
-{% if request.user == quest.owner %}
-	<span><a href="{{ url('quest:edit_quest', args=[quest_id, page_num]) }}">Edit Quest</a></span>
-{% endif %}
-	<span id="pageSelection">
-		<select onChange="window.location.href=this.value">
-			<optgroup label="Pages">
-				{% for page in pages %}
-				<option value="{{ url('quest:quest', args=[quest_id, page.page_num]) }}"{% if page.page_num == page_num %} selected="yes" {% if vars.update({'next_page': loop.nextitem}) %}{% endif %}{% endif %}>{{ page.title }}</option>
-				{% endfor %}
-			</optgroup>
-			{% if appendices %}
-			<optgroup label="Appendices">
-				{% for appendix in appendices %}
-				<option value="{{ url('quest:quest', args=[quest_id, appendix.page_num]) }}"{% if appendix.page_num == page_num %} selected="yes"{% endif %}>{{ appendix.title }}</option>
-				{% endfor %}
-			</optgroup>
-			{% endif %}
-		</select>
-	</span>
-	<span id="live" style="display:{% if quest.live %}initial{% else %}none{% endif %};">
-		LIVE
-	</span>
-	<span id="liveIn" style="display:{% if quest.live_time and not quest.live %}initial{% else %}none{% endif %};">
-		Live in: <span id="liveCountdown"></span> (<span id="liveTime">{% if quest.live_time %}{{ localtime(quest.live_time).strftime('%Y-%m-%d %H:%M') }}{% endif %}</span>)
-	</span>
-	<span id="toggleChat"><a onclick="toggle_chat()" href="javascript:void(0);">{% if request.session.get("hide_chat") == True %}←{% else %}→{% endif %}</a></span>
+{% include "quest/quest_header.html" %}
 {% endblock %}
 {% block content %}
 	<div id="questPane" style="width:{% if request.session.get("hide_chat") == True %}100%{% else %}70%{% endif %};">
diff --git a/quest/jinja2/quest/quest_header.html b/quest/jinja2/quest/quest_header.html
new file mode 100644
index 0000000..4edd220
--- /dev/null
+++ b/quest/jinja2/quest/quest_header.html
@@ -0,0 +1,31 @@
+{% if request.user == quest.owner %}
+	<span><a href="{{ url('quest:edit_quest', args=[quest_id, page_num]) }}">Edit Quest</a></span>
+{% endif %}
+	<span id="pageSelection">
+		<select onChange="window.location.href=this.value">
+			<optgroup label="Pages">
+				{% for page in pages %}
+				<option value="{{ url('quest:quest', args=[quest_id, page.page_num]) }}"{% if page.page_num == page_num %} selected="yes" {% if vars.update({'next_page': loop.nextitem}) %}{% endif %}{% endif %}>{{ page.title }}</option>
+				{% endfor %}
+			</optgroup>
+			{% if appendices %}
+			<optgroup label="Appendices">
+				{% for appendix in appendices %}
+				<option value="{{ url('quest:quest', args=[quest_id, appendix.page_num]) }}"{% if appendix.page_num == page_num %} selected="yes"{% endif %}>{{ appendix.title }}</option>
+				{% endfor %}
+			</optgroup>
+			{% endif %}
+		</select>
+	</span>
+	<span id="live" style="display:{% if quest.live %}initial{% else %}none{% endif %};">
+		LIVE
+	</span>
+	<span id="liveIn" style="display:{% if quest.live_time and not quest.live %}initial{% else %}none{% endif %};">
+		Live in: <span id="liveCountdown"></span> (<span id="liveTime">{% if quest.live_time %}{{ localtime(quest.live_time).strftime('%Y-%m-%d %H:%M') }}{% endif %}</span>)
+	</span>
+	<span id="space"></span>
+	{% if request.user.is_authenticated %}
+	<span id="profileLink"><a href="{{ url('user:profile', args=[request.user.id]) }}">Profile</a></span>
+	{% endif %}
+	<span id="toggleChat"><a onclick="toggle_chat()" href="javascript:void(0);">{% if request.session.get("hide_chat") == True %}←{% else %}→{% endif %}</a></span>
+
diff --git a/quest/jinja2/quest/quest_homepage.html b/quest/jinja2/quest/quest_homepage.html
index 75c342d..114e28b 100644
--- a/quest/jinja2/quest/quest_homepage.html
+++ b/quest/jinja2/quest/quest_homepage.html
@@ -20,37 +20,7 @@
 	<script>window.onload = load;</script>
 {% endblock %}
 {% block header %}
-{% if request.user == quest.owner %}
-	<span><a href="{{ url('quest:edit_quest', args=[quest_id, page_num]) }}">Edit Quest</a></span>
-{% endif %}
-	<span>
-		<select onChange="window.location.href=this.value">
-			<optgroup label="Pages">
-				{% for page in pages %}
-				<option value="{{ url('quest:quest', args=[quest_id, page.page_num]) }}"{% if page.page_num == page_num %} selected="yes" {% if vars.update({'next_page': loop.nextitem }) %}{% endif %}{% endif %}>{{ page.title }}</option>
-				{% endfor %}
-			</optgroup>
-			{% if appendices %}
-			<optgroup label="Appendices">
-				{% for appendix in appendices %}
-				<option value="{{ url('quest:quest', args=[quest_id, appendix.page_num]) }}"{% if appendix.page_num == page_num %} selected="yes"{% endif %}>{{ appendix.title }}</option>
-				{% endfor %}
-			</optgroup>
-			{% endif %}
-		</select>
-	</span>
-	{% if quest.live %}
-	<span id="live">
-		LIVE
-	</span>
-	{% else %}
-	{% if quest.live_time %}
-	<span id="liveIn">
-		Live in: <span id="liveCountdown"></span> (<span id="liveTime">{{ localtime(quest.live_time).strftime('%Y-%m-%d %H:%M') }}</span>)
-	</span>
-	{% endif %}
-	{% endif %}
-	<span id="toggleChat"><a onclick="toggle_chat()" href="javascript:void(0);">{% if request.session.get("hide_chat") == True %}←{% else %}→{% endif %}</a></span>
+{% include "quest/quest_header.html" %}
 {% endblock %}
 {% block content %}
 	<div id="questPane" style="width:{% if request.session.get("hide_chat") == True %}100%{% else %}70%{% endif %};">
diff --git a/quest/static/quest.css b/quest/static/quest.css
index c5e468b..ce1f481 100644
--- a/quest/static/quest.css
+++ b/quest/static/quest.css
@@ -14,8 +14,8 @@ h3 {
 	padding: 0.25em;
 }
 
-#toggleChat {
-	margin-left: auto;
+#space {
+	margin-right: auto;
 }
 
 #questPane {
diff --git a/todo b/todo
index e983225..1437da3 100644
--- a/todo
+++ b/todo
@@ -4,7 +4,6 @@ Front page to show new quests
 Webm posting
 (you) counter
 Account managament
-Display profile link in header bar
 Quote backlinks
 Email
 RSS