improve the user form to be used in two forms