Nicer fix for the previous issue

- since checkboxes weren't working for site admins
Merge branch 'features/ajaxification' into develop