[OE-4006] - fix form calculation of current vals