Added some checks to input form
uncommitted
uncommited
Revert "uncommited"

This reverts commit e12a367a99fe8bdfbdbb71d61e706b81b52b2e7b.