Revise core user form [skip ci]