Further fix some issues with proper authentication