fix notify user, and made js more resiliant to changes
Merge pull request #5446 from frisco82/fixNotifyUser

Fix notify user checkbox
Merge branch 'master' into fixing-5222-master