diff --git a/actions/admin/settings/180.dkim.php b/actions/admin/settings/180.dkim.php
index ecfd8f53..0857764d 100644
--- a/actions/admin/settings/180.dkim.php
+++ b/actions/admin/settings/180.dkim.php
@@ -81,7 +81,7 @@ return array(
 				'dkim_keylength' => array(
 					'label' => array(
 						'title' => $lng['dkim']['dkim_keylength']['title'],
-						'description' => $lng['dkim']['dkim_keylength']['description']
+						'description' => sprintf($lng['dkim_keylength']['label']['description'], Settings::Get('dkim.dkim_prefix'))
 					),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_keylength',
diff --git a/lib/classes/settings/class.Settings.php b/lib/classes/settings/class.Settings.php
index 23ac0e6a..8820af5d 100644
--- a/lib/classes/settings/class.Settings.php
+++ b/lib/classes/settings/class.Settings.php
@@ -78,8 +78,14 @@ class Settings {
 	 * and set the internal $_data array
 	 */
 	private function _readSettings() {
-		$settings_data = loadConfigArrayDir('actions/admin/settings/');
-		self::$_data = loadSettings($settings_data);
+		$result_stmt = Database::query("
+			SELECT `settingid`, `settinggroup`, `varname`, `value`
+			FROM `" . TABLE_PANEL_SETTINGS . "`
+		");
+		self::$_data = array();
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			self::$_data[$row['settinggroup']][$row['varname']] = $row['value'];
+		}
 	}
 
 	/**