PIM-1927 : fix form ids