Fix user auth in some cases