diff --git a/controller/registercontroller.php b/controller/registercontroller.php
index 470807e..62b4140 100644
--- a/controller/registercontroller.php
+++ b/controller/registercontroller.php
@@ -156,7 +156,8 @@ class RegisterController extends Controller {
 				return new TemplateResponse('registration', 'form',
 					array('email' => $email,
 						'entered_data' => array('username' => $username),
-						'errormsgs' => array($e->message, $username, $password)), 'guest');
+						'errormsgs' => array($e->getMessage()),
+						'token' => $token), 'guest');
 			}
 			if ( $user === false ) {
 				return new TemplateResponse('', 'error', array(