diff --git a/NEWS b/NEWS
index 194d540cb..92fa0974b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+4.0.7 (YYYY-MM-DD)
+------------------
+
+Bug fixes
+ - [web] date validator now handles non-latin characters
+
 4.0.6 (2019-02-21)
 ------------------
 
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index e161dc857..ee608ad68 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -154,6 +154,13 @@
       _this.$mdDateLocaleProvider.formatTime = function(date) {
         return date? date.format(_this.$mdDateLocaleProvider, _this.defaults.SOGoTimeFormat) : '';
       };
+      _this.$mdDateLocaleProvider.isDateComplete = function(dateString) {
+        dateString = dateString.trim();
+        // The default function of Angular Material doesn't handle non-latin characters.
+        // This one does.
+        var re = /^((([a-zA-Z]|[^\x00-\x7F]){3,}|[0-9]{1,4})([ .,]+|[/-])){2}(([a-zA-Z]|[^\x00-\x7F]){3,}|[0-9]{1,4})$/;
+        return re.test(dateString);
+      };
     }
 
     settingsElement = Preferences.$document[0].getElementById('UserSettings');