Resolved a conflict in Authenticator