diff --git a/src/components/userbar/LoggedInPanel.intl.json b/src/components/userbar/LoggedInPanel.intl.json
new file mode 100644
index 0000000..22b94b5
--- /dev/null
+++ b/src/components/userbar/LoggedInPanel.intl.json
@@ -0,0 +1,3 @@
+{
+    "logout": "Logout"
+}
diff --git a/src/components/userbar/LoggedInPanel.js b/src/components/userbar/LoggedInPanel.js
index 30e3252..f6d9c3f 100644
--- a/src/components/userbar/LoggedInPanel.js
+++ b/src/components/userbar/LoggedInPanel.js
@@ -7,7 +7,7 @@ import { intlShape } from 'react-intl';
 import buttons from 'components/ui/buttons.scss';
 import buttonGroups from 'components/ui/button-groups.scss';
 
-import messages from './LoggedInPanel.messages.js';
+import messages from './LoggedInPanel.intl.json';
 import styles from './loggedInPanel.scss';
 
 import { userShape } from 'components/user/User';
diff --git a/src/components/userbar/LoggedInPanel.messages.js b/src/components/userbar/LoggedInPanel.messages.js
deleted file mode 100644
index 1149c8f..0000000
--- a/src/components/userbar/LoggedInPanel.messages.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-export default defineMessages({
-    logout: {
-        id: 'logout',
-        defaultMessage: 'Logout'
-    }
-});
diff --git a/src/components/userbar/Userbar.intl.json b/src/components/userbar/Userbar.intl.json
new file mode 100644
index 0000000..83608e5
--- /dev/null
+++ b/src/components/userbar/Userbar.intl.json
@@ -0,0 +1,3 @@
+{
+    "register": "Join"
+}
diff --git a/src/components/userbar/Userbar.jsx b/src/components/userbar/Userbar.jsx
index fce3013..47db14e 100644
--- a/src/components/userbar/Userbar.jsx
+++ b/src/components/userbar/Userbar.jsx
@@ -5,7 +5,7 @@ import { FormattedMessage as Message } from 'react-intl';
 
 import buttons from 'components/ui/buttons.scss';
 
-import messages from './Userbar.messages.js';
+import messages from './Userbar.intl.json';
 import styles from './userbar.scss';
 
 import { userShape } from 'components/user/User';
diff --git a/src/components/userbar/Userbar.messages.js b/src/components/userbar/Userbar.messages.js
deleted file mode 100644
index 5974e7d..0000000
--- a/src/components/userbar/Userbar.messages.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-export default defineMessages({
-    register: {
-        id: 'register',
-        defaultMessage: 'Join'
-    }
-});
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9a0d547..829de8b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -96,9 +96,9 @@
     "components.profile.personalData": "Personal data",
     "components.profile.preferencesDescription": "Here you can change the key preferences of your account. Please note that all actions must be confirmed by entering a password.",
     "components.profile.twoFactorAuth": "Two factor auth",
-    "logout": "Logout",
+    "components.userbar.logout": "Logout",
+    "components.userbar.register": "Join",
     "pages.root.siteName": "Ely.by",
-    "register": "Join",
     "services.accountNotActivated": "The account is not activated",
     "services.emailFrequency": "Please cool down, you are requesting emails too often. New key can be retrieved after 30 minutes from the previous request.",
     "services.emailInvalid": "Email is invalid",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index d12ac9e..c45e63c 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -96,9 +96,9 @@
     "components.profile.personalData": "Персональные данные",
     "components.profile.preferencesDescription": "Здесь вы можете сменить ключевые параметры вашего аккаунта. Обратите внимание, что для всех действий необходимо подтверждение при помощи ввода пароля.",
     "components.profile.twoFactorAuth": "Двухфакторная аутентификация",
-    "logout": "Выход",
+    "components.userbar.logout": "Выход",
+    "components.userbar.register": "Регистрация",
     "pages.root.siteName": "Ely.by",
-    "register": "Регистрация",
     "services.accountNotActivated": "Аккаунт не активирован",
     "services.emailFrequency": "Пожалуйста, успокойтесь, вы запрашиваете E-mail слишком часто. Новый ключ можно будет заказать через 30 минут от предыдущего запроса.",
     "services.emailInvalid": "Указан неправильный E-mail",