Tweaked the Error Checking and Redirection after login

MMOORE Doesn't see this commit