Fix wizard form service