Current staff user empty fix