diff --git a/client/package-lock.json b/client/package-lock.json
index e798c245..2295ac8d 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -4734,19 +4734,11 @@
       "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
       "dev": true
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.14",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
-      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
-      "license": "MIT"
-    },
     "node_modules/@types/react": {
-      "version": "18.3.23",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.23.tgz",
-      "integrity": "sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w==",
-      "license": "MIT",
+      "version": "19.1.6",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.6.tgz",
+      "integrity": "sha512-JeG0rEWak0N6Itr6QUx+X60uQmN+5t3j9r/OVDtWzFXKaj6kD1BwJzOksD0FF6iWxZlbE1kB0q9vtnU2ekqa1Q==",
       "dependencies": {
-        "@types/prop-types": "*",
         "csstype": "^3.0.2"
       }
     },
@@ -14177,12 +14169,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/svg-country-flags": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/svg-country-flags/-/svg-country-flags-1.2.10.tgz",
-      "integrity": "sha512-xrqwo0TYf/h2cfPvGpjdSuSguUbri4vNNizBnwzoZnX0xGo3O5nGJMlbYEp7NOYcnPGBm6LE2axqDWSB847bLw==",
-      "license": "PD"
-    },
     "node_modules/svg-parser": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
@@ -15242,11 +15228,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/world-countries": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/world-countries/-/world-countries-5.1.0.tgz",
-      "integrity": "sha512-CXR6EBvTbArDlDDIWU3gfKb7Qk0ck2WNZ234b/A0vuecPzIfzzxH+O6Ejnvg1sT8XuiZjVlzOH0h08ZtaO7g0w=="
-    },
     "node_modules/wrap-ansi": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
diff --git a/client/src/locales/el-GR/index.js b/client/src/locales/el-GR/index.js
index 28db721d..f6e0e5f5 100644
--- a/client/src/locales/el-GR/index.js
+++ b/client/src/locales/el-GR/index.js
@@ -1,11 +1,8 @@
-import merge from 'lodash/merge';
-
 import login from './login';
-import core from './core';
 
 export default {
   language: 'el-GR',
   country: 'gr',
   name: 'Ελληνικά',
-  embeddedLocale: merge(login, core),
+  embeddedLocale: login,
 };
diff --git a/client/src/locales/index.js b/client/src/locales/index.js
index da1f28b0..0fb387c3 100644
--- a/client/src/locales/index.js
+++ b/client/src/locales/index.js
@@ -8,6 +8,7 @@ import bgBG from './bg-BG';
 import csCZ from './cs-CZ';
 import daDK from './da-DK';
 import deDE from './de-DE';
+import elGR from './el-GR';
 import enGB from './en-GB';
 import enUS from './en-US';
 import esES from './es-ES';
@@ -32,7 +33,6 @@ import ukUA from './uk-UA';
 import uzUZ from './uz-UZ';
 import zhCN from './zh-CN';
 import zhTW from './zh-TW';
-import elGR from './el-GR';
 
 const locales = [
   arYE,
@@ -40,6 +40,7 @@ const locales = [
   csCZ,
   daDK,
   deDE,
+  elGR,
   enGB,
   enUS,
   esES,
@@ -64,7 +65,6 @@ const locales = [
   uzUZ,
   zhCN,
   zhTW,
-  elGR,
 ];
 
 export default locales;
diff --git a/server/api/models/User.js b/server/api/models/User.js
index d5e9e357..e3971c0b 100755
--- a/server/api/models/User.js
+++ b/server/api/models/User.js
@@ -39,6 +39,7 @@ const LANGUAGES = [
   'cs-CZ',
   'da-DK',
   'de-DE',
+  'el-GR',
   'en-GB',
   'en-US',
   'es-ES',
@@ -63,7 +64,6 @@ const LANGUAGES = [
   'uz-UZ',
   'zh-CN',
   'zh-TW',
-  'el-GR',
 ];
 
 const PRIVATE_FIELD_NAMES = ['email', 'isSsoUser'];
diff --git a/server/config/i18n.js b/server/config/i18n.js
index 485ea0a0..dab3b812 100644
--- a/server/config/i18n.js
+++ b/server/config/i18n.js
@@ -19,7 +19,7 @@ module.exports.i18n = {
    *
    */
 
-  locales: ['en-GB', 'en-US', 'es-ES', 'it-IT', 'ru-RU', 'el-GR'],
+  locales: ['en-GB', 'en-US', 'es-ES', 'it-IT', 'ru-RU'],
 
   /**
    *