Once we have authenticated, we don't need a tagged authenticator any more

state.Entity is fine.
Should return in either case. This condition probably needs a test too.