[#1691] Add no-user case