Add temporary error message to sign-up page
Merge branch 'master' into user