fixes #3407 fixes #3412
Merge pull request #3441 from dotCMS/issue-3407-click-reduction-who-can-push

fixes #3407 fixes #3412