CORE-335 Script error on admin page
Merge pull request #1895 from reciprocity/feature/CORE-335

CORE-335 Script error on admin page