Make `new-user' half-work again