Fix for authentication management