Control Panel: fix https://abantecart.fogbugz.com/f/cases/223
Control Panel: fix https://abantecart.fogbugz.com/f/cases/222