diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index e574a3aaf..d79f9cb1e 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -113,6 +113,8 @@ class Settings { /* {{{ */
 	var $_enableVersionDeletion = false;
 	// enable/disable to overwrite the status of a version for regular users
 	var $_enableVersionModification = false;
+	// enable/disable duplicate names of a document in a folder
+	var $_enableDuplicateDocNames = true;
 	// enable/disable notification when added as a reviewer/approver
 	var $_enableNotificationAppRev = true;
 	// the name of the versioning info file created by the backup tool
@@ -137,6 +139,8 @@ class Settings { /* {{{ */
 	var $_firstDayOfWeek = 0;
 	// enable/disable display of the folder tree
 	var $_enableFolderTree = true;
+	// enable/disable language selection menu
+	var $_enableLanguageSelector = true;
 	// expandFolderTree
 	var $_expandFolderTree = 1;
 	// enable/disable editing of users own profile
@@ -293,6 +297,7 @@ class Settings { /* {{{ */
 		$this->_enableEmail = Settings::boolVal($tab["enableEmail"]);
 		$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
+		$this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]);
 		$this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
@@ -426,6 +431,7 @@ class Settings { /* {{{ */
 		$this->_workflowMode = strval($tab["workflowMode"]);
 		$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
+		$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
 
 		// XML Path: /configuration/advanced/notification
 		$node = $xml->xpath('/configuration/advanced/notification');
@@ -537,6 +543,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableEmail", $this->_enableEmail);
     $this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
+    $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector);
     $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch);
     $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
     $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
@@ -662,6 +669,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
+    $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
 
     // XML Path: /configuration/advanced/notification
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'notification');
diff --git a/install/settings.xml.template_install b/install/settings.xml.template_install
index cce5e0f92..0940023ff 100644
--- a/install/settings.xml.template_install
+++ b/install/settings.xml.template_install
@@ -21,6 +21,7 @@
        - enableEmail: enable/disable automatic email notification
        - enableUsersView: enable/disable group and user view for all users
        - enableFullSearch: false to don't use fulltext search
+       - enableLanguageSelector: false to don't show the language selector after login
        - enableFolderTree: false to don't show the folder tree
        - expandFolderTree: 0 to start with tree hidden
        -                   1 to start with tree shown and first level expanded
@@ -37,9 +38,9 @@
       enableFullSearch = "true"
       enableFolderTree = "true"
       expandFolderTree = "1"
+      enableLanguageSelector = "true"
       stopWordsFile = ""
       sortUsersInList = ""
-  
     >
     </edition> 
     <!-- enableCalendar: enable/disable calendar
@@ -192,10 +193,18 @@
     </authentication>
     <!-- enableAdminRevApp: false to don't list administrator as reviewer/approver
        - versioningFileName: the name of the versioning info file created by the backup tool
+       - workflowMode: 'traditional' or 'advanced'
+       - enableVersionDeletion: allow to delete versions after approval
+       - enableVersionModification: allow to modify versions after approval
+       - enableDuplicateDocNames: allow duplicate names in a folder
     --> 
     <edition
       enableAdminRevApp = "false"
       versioningFileName = "versioning_info.txt"
+      workflowMode = "advanced"
+      enableVersionDeletion = "true"
+      enableVersionModification = "true"
+      enableDuplicateDocNames = "true"
     >
     </edition>
 		<!-- enableNotificationAppRev: true to send notifation if a user is added as a reviewer or approver
diff --git a/op/op.Settings.php b/op/op.Settings.php
index cc2e899fb..79ea998e5 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -66,6 +66,7 @@ if ($action == "saveSettings")
   $settings->_enableUsersView = getBoolValue("enableUsersView");
   $settings->_enableFullSearch = getBoolValue("enableFullSearch");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
+  $settings->_enableLanguageSelector = getBoolValue("enableLanguageSelector");
   $settings->_expandFolderTree = intval($_POST["expandFolderTree"]);
 	$settings->_stopWordsFile = $_POST["stopWordsFile"];
 	$settings->_sortUsersInList = $_POST["sortUsersInList"];
@@ -133,6 +134,7 @@ if ($action == "saveSettings")
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
+  $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
 
   // SETTINGS - ADVANCED - NOTIFICATION
   $settings->_enableOwnerNotification = getBoolValue("enableOwnerNotification");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 9d2ba1ad6..8d423c69d 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -160,6 +160,10 @@ if(!is_writeable($settings->_configFilePath)) {
             <OPTION VALUE="2" <?php if ($settings->_expandFolderTree==2) echo "SELECTED" ?> ><?php printMLText("settings_expandFolderTree_val2");?></OPTION>
           </SELECT>
       </tr>
+      <tr title="<?php printMLText("settings_enableLanguageSelector_desc");?>">
+        <td><?php printMLText("settings_enableLanguageSelector");?>:</td>
+        <td><input name="enableLanguageSelector" type="checkbox" <?php if ($settings->_enableLanguageSelector) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_sortUsersInList_desc");?>">
         <td><?php printMLText("settings_sortUsersInList");?>:</td>
         <td>
@@ -435,6 +439,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableVersionModification");?>:</td>
         <td><input name="enableVersionModification" type="checkbox" <?php if ($settings->_enableVersionModification) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableDuplicateDocNames_desc");?>">
+        <td><?php printMLText("settings_enableDuplicateDocNames");?>:</td>
+        <td><input name="enableDuplicateDocNames" type="checkbox" <?php if ($settings->_enableDuplicateDocNames) echo "checked" ?> /></td>
+      </tr>
 
       <!--
         -- SETTINGS - ADVANCED - NOTIFICATION