Fix userparse.

Manual merge of 03a789e4f792da7