CDB-3923 Fix rare case of user deletion surfaced by failing spec