Added password reset and changed login via email to username