Adding hack that actually works for user-implicit auth.