Make user form more consistent with the other forms