Fixing Auth