diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php
index 3e9fe350065472b2d0a13613e2ad40ed8961c625..613c828d14906474fbda3a3b475508e5b8b2f997 100644
--- a/install/dist/conf/debian40.conf.php
+++ b/install/dist/conf/debian40.conf.php
@@ -183,7 +183,7 @@ $conf['jailkit']['installed'] = false; // will be detected automatically during
 $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
-$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
+$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch';
 $conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* Squid
diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php
index e18faa4967e4c4f963c2faa329efbc6100bbc416..2c26dcb9cbb26ae89f1126ce15440471485b028a 100644
--- a/install/dist/conf/debian60.conf.php
+++ b/install/dist/conf/debian60.conf.php
@@ -183,7 +183,7 @@ $conf['jailkit']['installed'] = false; // will be detected automatically during
 $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
-$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
+$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch';
 $conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* Squid
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 4259222c86629ea8068f4b9a2ecd10315be52815..ec7fac8af3ba30537ff341be74b9e99a2e2972e6 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -129,7 +129,7 @@ fastcgi_config_syntax=1
 [jailkit]
 jailkit_chroot_home=/home/[username]
 jailkit_chroot_app_sections=basicshell editors extendedshell netutils ssh sftp scp groups jk_lsh
-jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico
+jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch
 jailkit_chroot_cron_programs=/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php
 
 [vlogger]
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 116af651023ab31fac1e48307003e5429fe61118..08a224f599ac313b7d03e09a4a8639c9762c26d2 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -55,7 +55,9 @@ class db extends mysqli
 	private $autoCommit = 1;    // Autocommit Transactions
 	private $currentRow;  // current row number
 	private $errorNumber = 0; // last error number
+	*/
 	public $errorMessage = ''; // last error message
+	/*
 	private $errorLocation = '';// last error location
 	private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
 	////
@@ -503,6 +505,7 @@ class db extends mysqli
 
 		$mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
 		$mysql_errno = (is_object($this->_iConnId) ? mysqli_errno($this->_iConnId) : mysqli_connect_errno());
+		$this->errorMessage = $mysql_error;
 
 		//$sAddMsg .= getDebugBacktrace();
 
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 67bf7c46d5d0b7fac9176e80eeae185f6af29baf..bf4351974cda72b4efc7f335c827a08fef1ec767 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -55,7 +55,9 @@ class db extends mysqli
 	private $autoCommit = 1;    // Autocommit Transactions
 	private $currentRow;  // current row number
 	public $errorNumber = 0; // last error number
+	*/
 	public $errorMessage = ''; // last error message
+	/*
 	private $errorLocation = '';// last error location
 	private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
 	////
@@ -467,6 +469,7 @@ class db extends mysqli
 
 		$mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
 		$mysql_errno = (is_object($this->_iConnId) ? mysqli_errno($this->_iConnId) : mysqli_connect_errno());
+		$this->errorMessage = $mysql_error;
 
 		//$sAddMsg .= getDebugBacktrace();
 
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 284255153e220eec0f930ccab2f16a15d8a8f2c1..7ded684ea2e69f415a361a344584e798b311202e 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -325,7 +325,7 @@ class mail_plugin_dkim {
 					$this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
 				}
 			} else {
-				$app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_ERROR);
+				$app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_DEBUG);
 			}
 		}
 	}
@@ -369,45 +369,47 @@ class mail_plugin_dkim {
 	 */
 	function domain_dkim_update($event_name, $data) {
 		global $app;
-		if ($this->check_system($data)) {
-			/* maildomain disabled */
-			if ($data['new']['active'] == 'n' && $data['old']['active'] == 'y' && $data['new']['dkim']=='y') {
-				$app->log('Maildomain '.$data['new']['domain'].' disabled - remove DKIM-settings', LOGLEVEL_DEBUG);
-				$this->remove_dkim($data['new']);
-			}
-			/* maildomain re-enabled */
-			if ($data['new']['active'] == 'y' && $data['old']['active'] == 'n' && $data['new']['dkim']=='y') 
-				$this->add_dkim($data);
-
-			/* maildomain active - only dkim changes */
-			if ($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
-				/* dkim disabled */
-				if ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'n') {
+		if($data['new']['dkim'] == 'y' || $data['old']['dkim'] == 'y'){
+			if ($this->check_system($data)) {
+				/* maildomain disabled */
+				if ($data['new']['active'] == 'n' && $data['old']['active'] == 'y' && $data['new']['dkim']=='y') {
+					$app->log('Maildomain '.$data['new']['domain'].' disabled - remove DKIM-settings', LOGLEVEL_DEBUG);
 					$this->remove_dkim($data['new']);
 				}
-				/* dkim enabled */
-				elseif ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'y') {
-					$this->add_dkim($data);
-				}
-				/* new private-key */
-				if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
-					$this->add_dkim($data);
-				}
-				/* new selector */
-				if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
+				/* maildomain re-enabled */
+				if ($data['new']['active'] == 'y' && $data['old']['active'] == 'n' && $data['new']['dkim']=='y') 
 					$this->add_dkim($data);
+
+				/* maildomain active - only dkim changes */
+				if ($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
+					/* dkim disabled */
+					if ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'n') {
+						$this->remove_dkim($data['new']);
+					}
+					/* dkim enabled */
+					elseif ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'y') {
+						$this->add_dkim($data);
+					}
+					/* new private-key */
+					if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
+						$this->add_dkim($data);
+					}
+					/* new selector */
+					if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
+						$this->add_dkim($data);
+					}
+					/* new domain-name */
+					if ($data['new']['domain'] != $data['old']['domain']) {
+						$this->remove_dkim($data['old']);
+						$this->add_dkim($data);
+					}
 				}
-				/* new domain-name */
-				if ($data['new']['domain'] != $data['old']['domain']) {
-					$this->remove_dkim($data['old']);
+
+				/* resync */
+				if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
 					$this->add_dkim($data);
 				}
 			}
-
-			/* resync */
-			if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
-				$this->add_dkim($data);
-			}
 		}
 	}