Simplify formik logic

Fixes issue337

Edited by Zhou Fang

Merge request reports