Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings