diff --git a/common.php b/common.php
index 8d3d69a3..a10dce77 100644
--- a/common.php
+++ b/common.php
@@ -81,6 +81,12 @@ function postfixadmin_autoload($class) {
 }
 spl_autoload_register('postfixadmin_autoload');
 
+Lang::getInstance();
+Lang::write($PALANG);
+
+Config::getInstance();
+Config::write($CONF);
+
 if (!defined('POSTFIXADMIN_CLI')) {
     if(!is_file("$incpath/smarty.inc.php")) {
         die("smarty.inc.php is missing! Something is wrong...");
diff --git a/scripts/postfixadmin-cli.php b/scripts/postfixadmin-cli.php
index 5b125949..21d423b1 100644
--- a/scripts/postfixadmin-cli.php
+++ b/scripts/postfixadmin-cli.php
@@ -225,12 +225,6 @@ class PostfixAdmin {
                         }
                 }
 
-                Config::getInstance();
-                Config::write($CONF);
-                
-                Lang::getInstance();
-                Lang::write($PALANG);
-
                 return true;
         }