More fixes for user auth