Manually retrying on add-user and removing robustify