merged with login_and_sign_up