DEVIDM-76: Some minor changes, set the final return value of the authenticator to the same value as the extened class final value.