diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index d0a1b0119..286f67610 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Udaljeno',
     'Enabled' => 'Omogućeno',
     'Disabled' => 'Onemogućeno',
-    'Username:' => 'Korisničko ime:',
-    'Name:' => 'Ime i Prezime',
+    'Login:' => 'Korisničko ime:',
+    'Full Name:' => 'Ime i Prezime',
     'Email:' => 'Email: ',
     'Notifications:' => 'Obavještenja: ',
     'Notifications' => 'Obavještenja',
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index a271f342b..f5a9208c9 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Vzdálený',
     'Enabled' => 'Povoleno',
     'Disabled' => 'Zakázáno',
-    'Username:' => 'Uživatelské jméno:',
-    'Name:' => 'Jméno:',
+    'Login:' => 'Uživatelské jméno:',
+    'Full Name:' => 'Jméno:',
     'Email:' => 'e-mail',
     'Notifications:' => 'Upozornění:',
     'Notifications' => 'Upozornění',
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index e8cb382ae..da66d25a9 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Remote',
     'Enabled' => 'Aktiv',
     'Disabled' => 'Deaktiveret',
-    'Username:' => 'Brugernavn',
-    'Name:' => 'Navn:',
+    'Login:' => 'Brugernavn',
+    'Full Name:' => 'Navn:',
     'Email:' => 'Email:',
     'Notifications:' => 'Notifikationer:',
     'Notifications' => 'Notifikationer',
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 59d502f85..e99707f55 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Remote',
     'Enabled' => 'angeschaltet',
     'Disabled' => 'abgeschaltet',
-    'Username:' => 'Benutzername:',
-    'Name:' => 'Name:',
+    'Login:' => 'Benutzername:',
+    'Full Name:' => 'Vollständiger Name:',
     'Email:' => 'E-Mail:',
     'Notifications:' => 'Benachrichtigungen:',
     'Notifications' => 'Benachrichtigungen',
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 35aa5e8a3..f21a4ec2d 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Απομακρυσμένη',
     'Enabled' => 'Ενεργή',
     'Disabled' => 'Απενεργοποιημένη',
-    'Username:' => 'Username:',
-    'Name:' => 'Όνομα:',
+    'Login:' => 'Login:',
+    'Full Name:' => 'Όνομα:',
     'Email:' => 'Email:',
     'Notifications:' => 'Ειδοποιήσεις:',
     'Notifications' => 'Ειδοποιήσεις',
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 04b13e73a..0c38387ad 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Remota',
     'Enabled' => 'Activada',
     'Disabled' => 'Desactivada',
-    'Username:' => 'Nombre de usuario:',
-    'Name:' => 'Nombre:',
+    'Login:' => 'Nombre de usuario:',
+    'Full Name:' => 'Nombre:',
     'Email:' => 'Correo electrónico:',
     'Notifications:' => 'Notificaciones:',
     'Notifications' => 'Notificaciones',
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 3cef22a4a..cf20058db 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Etä',
     'Enabled' => 'Käytössä',
     'Disabled' => 'Pois käytöstä',
-    'Username:' => 'Käyttäjänimi:',
-    'Name:' => 'Nimi:',
+    'Login:' => 'Käyttäjänimi:',
+    'Full Name:' => 'Nimi:',
     'Email:' => 'Sähköpostiosoite:',
     'Notifications:' => 'Ilmoitukset:',
     'Notifications' => 'Ilmoitukset',
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index d306b08c8..e206ebd88 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Distant',
     'Enabled' => 'Activé',
     'Disabled' => 'Désactivé',
-    'Username:' => 'Nom d\'utilisateur :',
-    'Name:' => 'Nom :',
+    'Login:' => 'Nom d\'utilisateur :',
+    'Full Name:' => 'Nom :',
     'Email:' => 'Email :',
     'Notifications:' => 'Notifications :',
     'Notifications' => 'Notifications',
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index c7374b7a8..1ccd9ab29 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Távoli',
     'Enabled' => 'Engedélyezve',
     'Disabled' => 'Letiltva',
-    'Username:' => 'Felhasználónév:',
-    'Name:' => 'Név:',
+    'Login:' => 'Felhasználónév:',
+    'Full Name:' => 'Név:',
     'Email:' => 'E-mail:',
     'Notifications:' => 'Értesítések:',
     'Notifications' => 'Értesítések',
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index f858dd9c6..fb984ec33 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Jauh',
     'Enabled' => 'Aktif',
     'Disabled' => 'Nonaktif',
-    'Username:' => 'Nama pengguna :',
-    'Name:' => 'Nama :',
+    'Login:' => 'Nama pengguna :',
+    'Full Name:' => 'Nama :',
     'Email:' => 'Email :',
     'Notifications:' => 'Pemberitahuan :',
     'Notifications' => 'Pemberitahuan',
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index fc66a5047..b158bddbb 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Remoto',
     'Enabled' => 'Abilitato',
     'Disabled' => 'Disabilitato',
-    'Username:' => 'Nome utente:',
-    'Name:' => 'Nome:',
+    'Login:' => 'Nome utente:',
+    'Full Name:' => 'Nome:',
     // 'Email:' => '',
     'Notifications:' => 'Notifiche:',
     'Notifications' => 'Notifiche',
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 153357eda..71798594a 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'リモート',
     'Enabled' => '有効',
     'Disabled' => '無効',
-    'Username:' => 'ユーザ名:',
-    'Name:' => '名前:',
+    'Login:' => 'ユーザ名:',
+    'Full Name:' => '名前:',
     'Email:' => 'Email:',
     'Notifications:' => '通知:',
     'Notifications' => '通知',
diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php
index a00c06ed4..9a7c862f8 100644
--- a/app/Locale/ko_KR/translations.php
+++ b/app/Locale/ko_KR/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => '원격',
     'Enabled' => '활성화',
     'Disabled' => '비활성화',
-    'Username:' => '사용자명',
-    'Name:' => '이름:',
+    'Login:' => '사용자명',
+    'Full Name:' => '이름:',
     'Email:' => '이메일:',
     'Notifications:' => '알림:',
     'Notifications' => '알림',
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index 52e905737..0b1d3eb06 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Jauh',
     'Enabled' => 'Aktif',
     'Disabled' => 'Tidak aktif',
-    'Username:' => 'Nama pengguna :',
-    'Name:' => 'Nama:',
+    'Login:' => 'Nama pengguna :',
+    'Full Name:' => 'Nama:',
     'Email:' => 'Emel:',
     'Notifications:' => 'Makluman:',
     'Notifications' => 'Makluman',
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index 326f66356..65717c186 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Fjernstyrt',
     'Enabled' => 'Aktiv',
     'Disabled' => 'Deaktivert',
-    'Username:' => 'Brukernavn',
-    'Name:' => 'Navn:',
+    'Login:' => 'Brukernavn',
+    'Full Name:' => 'Navn:',
     'Email:' => 'Epost:',
     'Notifications:' => 'Varslinger:',
     'Notifications' => 'Varslinger',
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index a4cebe63a..06db5b65a 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Remote',
     'Enabled' => 'Actief',
     'Disabled' => 'Inactief',
-    'Username:' => 'Gebruikersnaam :',
-    'Name:' => 'Naam :',
+    'Login:' => 'Gebruikersnaam :',
+    'Full Name:' => 'Naam :',
     'Email:' => 'Email :',
     'Notifications:' => 'Notificaties :',
     'Notifications' => 'Notificaties',
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index f38fc0a65..8bfa31c74 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Zdalne',
     'Enabled' => 'Odblokowane',
     'Disabled' => 'Zablokowane',
-    'Username:' => 'Nazwa Użytkownika (login):',
-    'Name:' => 'Imię i Nazwisko',
+    'Login:' => 'Nazwa Użytkownika (login):',
+    'Full Name:' => 'Imię i Nazwisko',
     'Email:' => 'Email: ',
     'Notifications:' => 'Powiadomienia: ',
     'Notifications' => 'Powiadomienia',
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index f1b4be619..d0d2cc5bb 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Remoto',
     'Enabled' => 'Habilitado',
     'Disabled' => 'Desabilitado',
-    'Username:' => 'Usuário:',
-    'Name:' => 'Nome:',
+    'Login:' => 'Usuário:',
+    'Full Name:' => 'Nome:',
     'Email:' => 'E-mail:',
     'Notifications:' => 'Notificações:',
     'Notifications' => 'Notificações',
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 43c5ab2cf..b524bfd11 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Remoto',
     'Enabled' => 'Activado',
     'Disabled' => 'Desactivado',
-    'Username:' => 'Utilizador:',
-    'Name:' => 'Nome:',
+    'Login:' => 'Utilizador:',
+    'Full Name:' => 'Nome:',
     'Email:' => 'E-mail:',
     'Notifications:' => 'Notificações:',
     'Notifications' => 'Notificações',
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index add145256..05b63d6ff 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Удалённый',
     'Enabled' => 'Включён',
     'Disabled' => 'Выключены',
-    'Username:' => 'Имя пользователя:',
-    'Name:' => 'Имя:',
+    'Login:' => 'Имя пользователя:',
+    'Full Name:' => 'Имя:',
     'Email:' => 'E-mail:',
     'Notifications:' => 'Уведомления:',
     'Notifications' => 'Уведомления',
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 8f96f40cc..ffc418f75 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Udaljno',
     'Enabled' => 'Omogući',
     'Disabled' => 'Onemogući',
-    'Username:' => 'Korisničko ime:',
-    'Name:' => 'Ime i Prezime',
+    'Login:' => 'Korisničko ime:',
+    'Full Name:' => 'Ime i Prezime',
     'Email:' => 'Email: ',
     'Notifications:' => 'Obaveštenja: ',
     'Notifications' => 'Obaveštenja',
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 422937eca..78639ee06 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Fjärr',
     'Enabled' => 'Aktiverad',
     'Disabled' => 'Inaktiverad',
-    'Username:' => 'Användarnam:',
-    'Name:' => 'Namn:',
+    'Login:' => 'Användarnam:',
+    'Full Name:' => 'Namn:',
     'Email:' => 'E-post:',
     'Notifications:' => 'Notiser:',
     'Notifications' => 'Notiser',
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index a3c830f88..ac5d301ac 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'รีโมท',
     'Enabled' => 'เปิดการใช้',
     'Disabled' => 'ปิดการใช้',
-    'Username:' => 'ชื่อผู้ใช้:',
-    'Name:' => 'ชื่อ:',
+    'Login:' => 'ชื่อผู้ใช้:',
+    'Full Name:' => 'ชื่อ:',
     'Email:' => 'อีเมล:',
     'Notifications:' => 'แจ้งเตือน:',
     'Notifications' => 'การแจ้งเตือน',
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 55c419b54..49244aeb8 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => 'Uzak',
     'Enabled' => 'Etkinleştirildi',
     'Disabled' => 'Devre dışı bırakıldı',
-    'Username:' => 'Kullanıcı adı',
-    'Name:' => 'Ad',
+    'Login:' => 'Kullanıcı adı',
+    'Full Name:' => 'Ad',
     'Email:' => 'E-posta',
     'Notifications:' => 'Bildirimler:',
     'Notifications' => 'Bildirimler',
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 19290c36c..addc832d8 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -336,8 +336,8 @@ return array(
     'Remote' => '远程',
     'Enabled' => '启用',
     'Disabled' => '停用',
-    'Username:' => '用户名：',
-    'Name:' => '姓名：',
+    'Login:' => '用户名：',
+    'Full Name:' => '姓名：',
     'Email:' => '电子邮件：',
     'Notifications:' => '通知：',
     'Notifications' => '通知',
diff --git a/app/Template/user_view/profile.php b/app/Template/user_view/profile.php
index 117ab7199..486ca428e 100644
--- a/app/Template/user_view/profile.php
+++ b/app/Template/user_view/profile.php
@@ -3,9 +3,9 @@
     <?= $this->avatar->render($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path']) ?>
     <div class="panel">
         <ul>
-            <li><?= t('Username:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li>
-            <li><?= t('Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li>
+            <li><?= t('Login:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li>
+            <li><?= t('Full Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li>
             <li><?= t('Email:') ?> <strong><?= $this->text->e($user['email']) ?: t('None') ?></strong></li>
         </ul>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php
index 4b444b89c..e57fd4cd6 100644
--- a/app/Template/user_view/show.php
+++ b/app/Template/user_view/show.php
@@ -2,8 +2,8 @@
     <h2><?= t('Summary') ?></h2>
 </div>
 <ul class="panel">
-    <li><?= t('Username:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li>
-    <li><?= t('Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li>
+    <li><?= t('Login:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li>
+    <li><?= t('Full Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li>
     <li><?= t('Email:') ?> <strong><?= $this->text->e($user['email']) ?: t('None') ?></strong></li>
     <li><?= t('Status:') ?> <strong><?= $user['is_active'] ? t('Active') : t('Inactive') ?></strong></li>
 </ul>