diff --git a/routes/public.js b/routes/public.js
index 60098ef..cf176dd 100644
--- a/routes/public.js
+++ b/routes/public.js
@@ -17,7 +17,7 @@ router.get('/', async ctx => {
 	try {
 		await ctx.render('index', ctx.hbs)
 	} catch(err) {
-		await ctx.render('error', {message: err.message})
+		await ctx.render('error', ctx.hbs)
 	}
 })
 
diff --git a/views/index.handlebars b/views/index.handlebars
index ff031dc..f5dfbba 100644
--- a/views/index.handlebars
+++ b/views/index.handlebars
@@ -13,10 +13,10 @@
 		<header>
 			<h1>Home</h1>
 			{{#if authorised}}
-			<a href="/logout">log out</a>
-		{{else}}
-			<a href="/login">log in</a>
-		{{/if}}
+				<a href="/logout">log out</a>
+			{{else}}
+				<a href="/login">log in</a>
+			{{/if}}
 		</header>
 		{{#if msg}}
  			<p class="msg">{{msg}}</p>
diff --git a/views/register.handlebars b/views/register.handlebars
index 724a62e..69e90ea 100644
--- a/views/register.handlebars
+++ b/views/register.handlebars
@@ -21,15 +21,15 @@
 		<form action="/register" enctype="multipart/form-data" method="post">
 			<p>
 				<label for="user">Username</label><br />
-				<input type="text" name="user" placeholder="your preferred username (no spaces)" value="">
+				<input type="text" name="user" placeholder="your preferred username (no spaces)" value="{{body.user}}">
 			</p>
 			<p>
 				<label for="pass">Password</label><br />
-				<input type="password" name="pass" placeholder="your chosen password" value="">
+				<input type="password" name="pass" placeholder="your chosen password" value="{{body.pass}}">
 			</p>
 			<p>
 				<label for="email">Email</label><br />
-				<input type="email" name="email" placeholder="a valid email address" value="">
+				<input type="email" name="email" placeholder="a valid email address" value="{{body.email}}">
 			</p>
 			<p><input type="submit" value="Create"></p>
 		</form>