Moved Abort to after other actions just in case.
Adjusting the way we handle login errors. Found bug and am fixing it. Line 91
Commented unnecessary test code.