Changed form values to avoid default 0