move user fields to own template