A couple of fixes and full functionality of New required fields feature

We need to check these changes a bit further as I uncommented some lines and commented others and it worked... kind of weird.