Current user staff empty fix