Minor tweaks. Yet to solve AttemptLogin.