Fixes #695 in AdminCP