Planning to overhaul Authenticator logic for intuitiveness