support empty work for new registrations correctly