Fix for internal authentication feature