diff --git a/client/src/locales/ar-YE/core.js b/client/src/locales/ar-YE/core.js
index 73042d53..4dfea111 100644
--- a/client/src/locales/ar-YE/core.js
+++ b/client/src/locales/ar-YE/core.js
@@ -1,4 +1,8 @@
+import dateFns from 'date-fns/locale/ar';
+
 export default {
+  dateFns,
+
   format: {
     date: 'M/d/yyyy',
     time: 'p',
@@ -153,8 +157,7 @@ export default {
       subscribeToMyOwnCardsByDefault: 'الاشتراك في بطاقاتي الخاصة إفتراضياً',
       taskActions_title: 'إجراءات المهمة',
       tasks: 'المهام',
-      thereIsNoPreviewAvailableForThisAttachment:
-        'لا يوجد معاينة متاحة لهذا المرفق.',
+      thereIsNoPreviewAvailableForThisAttachment: 'لا يوجد معاينة متاحة لهذا المرفق.',
       time: 'الوقت',
       title: 'العنوان',
       userActions_title: 'إجراءات المستخدم',
diff --git a/client/src/locales/ar-YE/index.js b/client/src/locales/ar-YE/index.js
index e547c40b..d8a057fd 100644
--- a/client/src/locales/ar-YE/index.js
+++ b/client/src/locales/ar-YE/index.js
@@ -1,11 +1,8 @@
-import merge from 'lodash/merge';
-
 import login from './login';
-import core from './core';
 
 export default {
   language: 'ar-YE',
   country: 'ye',
   name: 'العربية',
-  embeddedLocale: merge(login, core),
+  embeddedLocale: login,
 };
diff --git a/client/src/locales/index.js b/client/src/locales/index.js
index 32b17327..3793b24a 100644
--- a/client/src/locales/index.js
+++ b/client/src/locales/index.js
@@ -1,3 +1,4 @@
+import arYE from './ar-YE';
 import bgBG from './bg-BG';
 import csCZ from './cs-CZ';
 import daDK from './da-DK';
@@ -25,6 +26,7 @@ import zhCN from './zh-CN';
 import zhTW from './zh-TW';
 
 const locales = [
+  arYE,
   bgBG,
   csCZ,
   daDK,
diff --git a/server/api/models/User.js b/server/api/models/User.js
index a4216c8a..2c17bea7 100755
--- a/server/api/models/User.js
+++ b/server/api/models/User.js
@@ -6,6 +6,7 @@
  */
 
 const LANGUAGES = [
+  'ar-YE',
   'bg-BG',
   'cs-CZ',
   'da-DK',