All tests passing and merged with master.

app/main/views/register.py

@@ -8,6 +8,8 @@ from flask import (
     url_for
 )
 
+from flask.ext.login import current_user
+
 from client.errors import HTTPError
 
 from app.main import main
@@ -19,7 +21,10 @@ from app import user_api_client
 
 @main.route('/register', methods=['GET', 'POST'])
 def register():
-    form = RegisterUserForm(users_dao.get_user_by_email)
+    if current_user and current_user.is_authenticated():
+        return redirect(url_for('main.choose_service'))
+
+    form = RegisterUserForm(users_dao.is_email_unique)
 
     if form.validate_on_submit():
         try: