Update user form according to mockup v2