Small refactor to auth service.