switched user to e-mail authentification, error handling improved