Some more changes to authenticator...