Big fix for login