fix for authentication refactor