Had trouble logging in with the new merge