[FIX] Authentication fixes