Fixed authentication bug with setup mail.
Authentication was not being reset because username and password
were maintained. Decoupled those into different checks.