Improve HawkAutoAuthenticationServiceFactory