Merge pull request #1438 from IT-Can/form-helper-fix

Form helper fixes for issues triggered by 773ccc318f2769c9b7579630569b5d8ba47b114b