diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index 299ed7caa..fde7db0cc 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -43,7 +43,7 @@
 
       // Set the locale of CKEditor
       this.localeCode = Preferences.defaults.LocaleCode;
-      this.ckConfig = { language: Preferences.defaults.LocaleCode };
+      this.ckConfig = { language: Preferences.defaults.ckLocaleCode };
 
       this.composeType = Preferences.defaults.SOGoMailComposeMessageType;
 
diff --git a/UI/WebServerResources/js/Preferences/AccountDialogController.js b/UI/WebServerResources/js/Preferences/AccountDialogController.js
index fc5757789..18786ce2d 100644
--- a/UI/WebServerResources/js/Preferences/AccountDialogController.js
+++ b/UI/WebServerResources/js/Preferences/AccountDialogController.js
@@ -28,7 +28,7 @@
       'toolbar': [['Bold', 'Italic', '-', 'Link',
                    'Font','FontSize','-','TextColor',
                    'BGColor', 'Source']],
-      language: defaults.LocaleCode
+      language: defaults.ckLocaleCode
     };
 
     if (!this.account.encryption)
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 4d1552ba0..b32df842e 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -163,6 +163,17 @@
       else
         data.SOGoContactsCategories = _.compact(data.SOGoContactsCategories);
 
+      if (data.LocaleCode) {
+        switch (data.LocaleCode) {
+        case 'sr_ME':
+        case 'sr_RS':
+          data.ckLocaleCode = 'sr-latn';
+          break;
+        default:
+          data.ckLocaleCode = data.LocaleCode.replace('_', '-').toLowerCase();
+        }
+      }
+
       angular.extend(_this.defaults, data);
 
       // Configure date locale