Fix forms management