Merge pull request #857 from MrPetovan/task/fix-admin-addons