Improve error handling on login/signup forms
More attempts to clean up the login forms. FIXME: We still have two...