diff --git a/client/src/locales/et-EE/core.js b/client/src/locales/et-EE/core.js
index e63b0d56..9d05bd5c 100644
--- a/client/src/locales/et-EE/core.js
+++ b/client/src/locales/et-EE/core.js
@@ -1,6 +1,11 @@
+import dateFns from 'date-fns/locale/et';
+import timeAgo from 'javascript-time-ago/locale/et';
+
 import markdownEditor from './markdown-editor.json';
 
 export default {
+  dateFns,
+  timeAgo,
   markdownEditor,
 
   format: {
@@ -314,7 +319,6 @@ export default {
       visualTaskManagementWithLists: 'Visual tööülesande haldamine nimekirjade abil.',
       withoutBaseGroup: 'Ilma põhiklassita',
       writeComment: 'Kirjuta kommentaar...',
-      taskList_hideChecked: 'Peida märgistatud elemendid',
     },
 
     action: {
@@ -428,7 +432,6 @@ export default {
       unsubscribe: 'Tühista tellimus',
       uploadNewAvatar: 'Laadi üles uus avatar',
       uploadNewImage: 'Laadi üles uus pilt',
-      moveListToBoard: 'Liiguta nimekiri teisele tahvlile',
     },
   },
 };
diff --git a/client/src/locales/et-EE/index.js b/client/src/locales/et-EE/index.js
index 923e8c1c..e8bf9a61 100644
--- a/client/src/locales/et-EE/index.js
+++ b/client/src/locales/et-EE/index.js
@@ -1,8 +1,8 @@
-import core from './core';
+import login from './login';
 
 export default {
   language: 'et-EE',
   country: 'ee',
   name: 'Eesti',
-  embeddedLocale: core,
+  embeddedLocale: login,
 };
diff --git a/client/src/locales/index.js b/client/src/locales/index.js
index 1c71e9d9..d0d2bad9 100644
--- a/client/src/locales/index.js
+++ b/client/src/locales/index.js
@@ -12,6 +12,7 @@ import elGR from './el-GR';
 import enGB from './en-GB';
 import enUS from './en-US';
 import esES from './es-ES';
+import etEE from './et-EE';
 import faIR from './fa-IR';
 import fiFI from './fi-FI';
 import frFR from './fr-FR';
@@ -29,7 +30,6 @@ import skSK from './sk-SK';
 import srCyrlRS from './sr-Cyrl-RS';
 import srLatnRS from './sr-Latn-RS';
 import svSE from './sv-SE';
-import etEE from './et-EE';
 import trTR from './tr-TR';
 import ukUA from './uk-UA';
 import uzUZ from './uz-UZ';
@@ -46,6 +46,7 @@ const locales = [
   enGB,
   enUS,
   esES,
+  etEE,
   faIR,
   fiFI,
   frFR,
@@ -63,7 +64,6 @@ const locales = [
   srCyrlRS,
   srLatnRS,
   svSE,
-  etEE,
   trTR,
   ukUA,
   uzUZ,
diff --git a/server/api/models/User.js b/server/api/models/User.js
index eed6292f..e9bcdcbb 100755
--- a/server/api/models/User.js
+++ b/server/api/models/User.js
@@ -43,6 +43,7 @@ const LANGUAGES = [
   'en-GB',
   'en-US',
   'es-ES',
+  'et-EE',
   'fa-IR',
   'fi-FI',
   'fr-FR',
@@ -60,7 +61,6 @@ const LANGUAGES = [
   'sr-Cyrl-RS',
   'sr-Latn-RS',
   'sv-SE',
-  'et-EE',
   'tr-TR',
   'uk-UA',
   'uz-UZ',