diff --git a/client/src/locales/index.js b/client/src/locales/index.js
index def6f4e5..38bd0daf 100644
--- a/client/src/locales/index.js
+++ b/client/src/locales/index.js
@@ -19,8 +19,8 @@ import ptBR from './pt-BR';
 import roRO from './ro-RO';
 import ruRU from './ru-RU';
 import skSK from './sk-SK';
-import srLaCS from './sr-Latn-CS';
-import srCyCS from './sr-Cyrl-CS';
+import srCyrlCS from './sr-Cyrl-CS';
+import srLatnCS from './sr-Latn-CS';
 import svSE from './sv-SE';
 import trTR from './tr-TR';
 import ukUA from './uk-UA';
@@ -50,8 +50,8 @@ const locales = [
   roRO,
   ruRU,
   skSK,
-  srLaCS,
-  srCyCS,
+  srCyrlCS,
+  srLatnCS,
   svSE,
   trTR,
   ukUA,
diff --git a/client/src/locales/sr-Cyrl-CS/index.js b/client/src/locales/sr-Cyrl-CS/index.js
index 8a6af240..a70481b8 100644
--- a/client/src/locales/sr-Cyrl-CS/index.js
+++ b/client/src/locales/sr-Cyrl-CS/index.js
@@ -1,11 +1,8 @@
-import merge from 'lodash/merge';
-
 import login from './login';
-import core from './core';
 
 export default {
   language: 'sr-Cyrl-CS',
   country: 'rs',
   name: 'Српски (ћирилица)',
-  embeddedLocale: merge(login, core),
+  embeddedLocale: login,
 };
diff --git a/client/src/locales/sr-Latn-CS/core.js b/client/src/locales/sr-Latn-CS/core.js
index bb884e78..1b18e25b 100644
--- a/client/src/locales/sr-Latn-CS/core.js
+++ b/client/src/locales/sr-Latn-CS/core.js
@@ -1,4 +1,4 @@
-import dateFns from 'date-fns/locale/sr';
+import dateFns from 'date-fns/locale/sr-Latn';
 
 export default {
   dateFns,
diff --git a/client/src/locales/sr-Latn-CS/index.js b/client/src/locales/sr-Latn-CS/index.js
index caaed04f..227410d7 100644
--- a/client/src/locales/sr-Latn-CS/index.js
+++ b/client/src/locales/sr-Latn-CS/index.js
@@ -1,11 +1,8 @@
-import merge from 'lodash/merge';
-
 import login from './login';
-import core from './core';
 
 export default {
   language: 'sr-Latn-CS',
   country: 'rs',
   name: 'Srpski (latinica)',
-  embeddedLocale: merge(login, core),
+  embeddedLocale: login,
 };
diff --git a/server/api/models/User.js b/server/api/models/User.js
index 7b28d3e4..955ca25f 100755
--- a/server/api/models/User.js
+++ b/server/api/models/User.js
@@ -27,6 +27,8 @@ const LANGUAGES = [
   'ro-RO',
   'ru-RU',
   'sk-SK',
+  'sr-Cyrl-CS',
+  'sr-Latn-CS',
   'sv-SE',
   'tr-TR',
   'uk-UA',