Custom forms checkbox and radio fix
Merge pull request #1977 from andig/master

custom forms fix