Fix Issue #683

Also fixes problem with localization of interface in admin panel.