diff --git a/backend/lib/Util/Configuration.php b/backend/lib/Util/Configuration.php
index 7ba0935..b924a9e 100644
--- a/backend/lib/Util/Configuration.php
+++ b/backend/lib/Util/Configuration.php
@@ -45,10 +45,10 @@ class Configuration {
 		$values =& self::$values;
 		$tree = explode('.', $var);
 		foreach ($tree as $part) {
-			$values =& $values[$part];	// TODO use array_merge_recursive()
+			$values =& $values[$part];
 		}
 
-		$values = $value;
+		$values = array_merge_recursive($values, $value);
 	}
 
 	/**
@@ -144,4 +144,4 @@ EOT;
 	}
 }
 
-?>
\ No newline at end of file
+?>