diff --git a/quest/jinja2/quest/edit_quest.html b/quest/jinja2/quest/edit_quest.html
index 65727ec..1827dde 100644
--- a/quest/jinja2/quest/edit_quest.html
+++ b/quest/jinja2/quest/edit_quest.html
@@ -28,8 +28,8 @@
 			</tr>
 			<tr>
 				<td>Live time:</td>
-				<td><input type="date" name="live_date" id="live_date" value="{{ localtime(quest.live_time).strftime('%Y-%m-%d') }}"></td>
-				<td><input type="time" name="live_time" id="live_time" step="60" value="{{ localtime(quest.live_time).strftime('%H:%M:%S') }}"></td>
+				<td><input type="date" name="live_date" id="live_date" value="{% if quest.live_time %}{{ localtime(quest.live_time).strftime('%Y-%m-%d') }}{% endif %}"></td>
+				<td><input type="time" name="live_time" id="live_time" step="60" value="{% if quest.live_time %}{{ localtime(quest.live_time).strftime('%H:%M:%S') }}{% endif %}"></td>
 			</tr>
 		</table>
 		<input type="hidden" name="timezone" id="timezone">
diff --git a/quest/views.py b/quest/views.py
index bab72f6..b60af44 100644
--- a/quest/views.py
+++ b/quest/views.py
@@ -49,7 +49,7 @@ def quest(request, quest_id, page_num='0'):
 		return render(request, 'quest/quest.html', context)
 
 
-def edit_quest(request, quest_id, page_num=1):
+def edit_quest(request, quest_id, page_num='0'):
 	"""
 	Edit quest page. Only available to the QM.
 	"""