* FIX : Pre-Authentication support