diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index 1c073cdca..c856f96a6 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -462,7 +462,9 @@
 
 - (int) searchMinimumWordLength
 {
-  return [self integerForKey: @"SOGoSearchMinimumWordLength"];
+  int min = [self integerForKey: @"SOGoSearchMinimumWordLength"];
+  if(min<1) min=1;
+  return min;
 }
 
 - (BOOL) notifyOnPersonalModifications
diff --git a/UI/WebServerResources/js/Common/Common.app.js b/UI/WebServerResources/js/Common/Common.app.js
index 06a23e162..d6f7ba7c0 100644
--- a/UI/WebServerResources/js/Common/Common.app.js
+++ b/UI/WebServerResources/js/Common/Common.app.js
@@ -36,7 +36,9 @@
           return settings;
       },
       minimumSearchLength: function () {
-        return angular.isNumber(minimumSearchLength) ? minimumSearchLength : 2;
+        minSearch = angular.isNumber(minimumSearchLength) ? minimumSearchLength : 2;
+        minSearch = minSearch > 1 ? minSearch : 1;
+        return minSearch;
       }
     })