Remove user dependency in authenticator