new-user: Expand ~$USERNM correctly