diff --git a/application/Espo/Core/Controllers/Record.php b/application/Espo/Core/Controllers/Record.php
index e38df81400..a5beff89a5 100644
--- a/application/Espo/Core/Controllers/Record.php
+++ b/application/Espo/Core/Controllers/Record.php
@@ -227,9 +227,9 @@ class Record extends Base
 			if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
 				$result = $result || true;
 			}
-			if ($result) {
-				return true;
-			}
+		}
+		if ($result) {
+			return true;
 		}	
 		
 		throw new Error();		
@@ -255,9 +255,9 @@ class Record extends Base
 			if ($this->getRecordService()->unlinkEntity($id, $link, $foreignId)) {
 				$result = $result || true;
 			}
-			if ($result) {
-				return true;
-			}
+		}
+		if ($result) {
+			return true;
 		}	
 		
 		throw new Error();		
diff --git a/application/Espo/Resources/metadata/entityDefs/Preferences.json b/application/Espo/Resources/metadata/entityDefs/Preferences.json
index 4c848d8b50..c5a0a802a4 100644
--- a/application/Espo/Resources/metadata/entityDefs/Preferences.json
+++ b/application/Espo/Resources/metadata/entityDefs/Preferences.json
@@ -21,12 +21,14 @@
         },
         "thousandSeparator": {
             "type": "varchar",
-            "default": ","
+            "default": ",",
+            "maxLength": 1
         },
         "decimalMark": {
             "type": "varchar",
             "default": ".",
-            "required": true
+            "required": true,
+            "maxLength": 1
         },
         "defaultCurrency": {
             "type": "enum",
diff --git a/application/Espo/Resources/metadata/entityDefs/Settings.json b/application/Espo/Resources/metadata/entityDefs/Settings.json
index 8c4f78511f..a38612ddc3 100644
--- a/application/Espo/Resources/metadata/entityDefs/Settings.json
+++ b/application/Espo/Resources/metadata/entityDefs/Settings.json
@@ -40,12 +40,14 @@
         },
         "thousandSeparator": {
             "type": "varchar",
-            "default": ","
+            "default": ",",
+            "maxLength": 1
         },
         "decimalMark": {
             "type": "varchar",
             "default": ".",
-            "required": true
+            "required": true,
+            "maxLength": 1
         },
         "currencyList": {
             "type": "array",