update user forms to be a bit more DRY