Fixed issue with conflicing form ids