cleaned up forgot-password and forgot-username code