Fixed Authentication Issues