diff --git a/src/config.js b/src/config.js
index 28c9fc5a..8c0c91e0 100644
--- a/src/config.js
+++ b/src/config.js
@@ -26,3 +26,4 @@ iptables -A FORWARD -o wg0 -j ACCEPT;
 
 module.exports.WG_PRE_DOWN = process.env.WG_PRE_DOWN || '';
 module.exports.WG_POST_DOWN = process.env.WG_POST_DOWN || '';
+module.exports.LANG = process.env.LANG || 'en';
diff --git a/src/lib/Server.js b/src/lib/Server.js
index c893d7d5..0279796f 100644
--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@@ -14,6 +14,7 @@ const {
   PORT,
   RELEASE,
   PASSWORD,
+  LANG,
 } = require('../config');
 
 module.exports = class Server {
@@ -134,6 +135,9 @@ module.exports = class Server {
         const { address } = req.body;
         return WireGuard.updateClientAddress({ clientId, address });
       }))
+      .get('/api/lang', (Util.promisify(async () => {
+        return LANG;
+      })))
 
       .listen(PORT, () => {
         debug(`Listening on http://0.0.0.0:${PORT}`);
diff --git a/src/www/index.html b/src/www/index.html
index 14259b9e..d54cbe9f 100644
--- a/src/www/index.html
+++ b/src/www/index.html
@@ -33,26 +33,10 @@
               d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
           </svg>
         </span>
-        <div class="flex flex-row flex-auto items-center mt-10 mb-2">
-          <h1 class="text-4xl font-medium flex-grow">
-            <img src="./img/logo.png" width="32" class="inline align-middle" />
-            <span class="align-middle">WireGuard</span>
-          </h1>
-          <div class="relative inline-block text-left flex-shrink-0">
-            <button type="button" class="inline-flex justify-center w-40 rounded-md border border-gray-100 shadow-sm py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:bg-gray-100 focus:border-gray-200" id="menu-button" aria-expanded="true" aria-haspopup="true" @click="langDropdownShow = !langDropdownShow">
-              {{$t("changeLang")}}
-              <svg class="-mr-1 ml-2 h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
-              </svg>
-            </button>
-            <div v-show="langDropdownShow" class="absolute right-0 mt-2 w-40 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="menu-button">
-              <div class="py-1" role="none">
-                <a href="#" @click="changeLang('en')" class="text-gray-700 block px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900" role="menuitem" id="menu-item-0" data-lang="en">English</a>
-                <a href="#" @click="changeLang('ru')" class="text-gray-700 block px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900" role="menuitem" id="menu-item-1" data-lang="ru">Русский</a>
-              </div>
-            </div>
-          </div>
-       </div>
+        <h1 class="text-4xl font-medium mt-10 mb-2">
+          <img src="./img/logo.png" width="32" class="inline align-middle" />
+          <span class="align-middle">WireGuard</span>
+        </h1>
         <h2 class="text-sm text-gray-400 mb-10"></h2>
 
         <div v-if="latestRelease" class="bg-red-800 p-4 text-white text-sm font-small mb-10 rounded-md shadow-lg"
@@ -118,7 +102,7 @@
                 <div class="flex-grow">
 
                   <!-- Name -->
-                  <div class="text-gray-700 group" :title="$t('createdOn') + dateTime(new Date(client.createdOn))">
+                  <div class="text-gray-700 group" :title="$t('createdOn') + dateTime(new Date(client.createdAt))">
 
                     <!-- Show -->
                     <input v-show="clientEditNameId === client.id" v-model="clientEditName"
diff --git a/src/www/js/api.js b/src/www/js/api.js
index 84885f17..0fbcfb35 100644
--- a/src/www/js/api.js
+++ b/src/www/js/api.js
@@ -117,4 +117,11 @@ class API {
     });
   }
 
+  async getLang() {
+    return this.call({
+      method: 'get',
+      path: '/lang',
+    });
+  }
+
 }
diff --git a/src/www/js/app.js b/src/www/js/app.js
index 2ffea223..b1832956 100644
--- a/src/www/js/app.js
+++ b/src/www/js/app.js
@@ -55,8 +55,6 @@ new Vue({
     currentRelease: null,
     latestRelease: null,
 
-    langDropdownShow: false,
-
     chartOptions: {
       chart: {
         background: 'transparent',
@@ -255,10 +253,6 @@ new Vue({
         .catch(err => alert(err.message || err.toString()))
         .finally(() => this.refresh().catch(console.error));
     },
-    changeLang(lang) {
-      localStorage.setItem('lang', lang);
-      i18n.locale = lang;
-    },
   },
   filters: {
     bytes,
@@ -285,6 +279,12 @@ new Vue({
     }, 1000);
 
     Promise.resolve().then(async () => {
+      const lang = await this.api.getLang();
+      if (lang !== localStorage.getItem('lang') && i18n.availableLocales.includes(lang)) {
+        localStorage.setItem('lang', lang);
+        i18n.locale = lang;
+      }
+
       const currentRelease = await this.api.getRelease();
       const latestRelease = await fetch('https://weejewel.github.io/wg-easy/changelog.json')
         .then(res => res.json())
diff --git a/src/www/js/i18n.js b/src/www/js/i18n.js
index 422d8008..93101a33 100644
--- a/src/www/js/i18n.js
+++ b/src/www/js/i18n.js
@@ -15,7 +15,7 @@ const messages = { // eslint-disable-line no-unused-vars
     deleteDialog2: 'This action cannot be undone.',
     cancel: 'Cancel',
     create: 'Create',
-    createdAt: 'Created on ',
+    createdOn: 'Created on ',
     lastSeen: 'Last seen on ',
     totalDownload: 'Total Download: ',
     totalUpload: 'Total Upload: ',
@@ -27,7 +27,6 @@ const messages = { // eslint-disable-line no-unused-vars
     downloadConfig: 'Download Configuration',
     madeBy: 'Made by',
     donate: 'Donate',
-    changeLang: 'Change language',
   },
   ru: {
     name: 'Имя',
@@ -43,7 +42,7 @@ const messages = { // eslint-disable-line no-unused-vars
     deleteDialog2: 'Это действие невозможно отменить.',
     cancel: 'Закрыть',
     create: 'Создать',
-    createdAt: 'Создано в ',
+    createdOn: 'Создано в ',
     lastSeen: 'Последнее подключение в ',
     totalDownload: 'Всего скачано: ',
     totalUpload: 'Всего загружено: ',
@@ -55,6 +54,5 @@ const messages = { // eslint-disable-line no-unused-vars
     downloadConfig: 'Скачать конфигурацию',
     madeBy: 'Сделано',
     donate: 'Поблагодарить',
-    changeLang: 'Выбор языка',
   },
 };