(Also correct the set of names we accept in User=, which was forgotten to be updated in ae480f0b09.
ae480f0b09