Replace form price logic with variable + normal logic

Replace form price logic with variable + normal logic #6042