Form duplication fix

Please review the following