WHQ: templatize editing of user; fix handling of output after edit.