diff --git a/application/Espo/Services/Language.php b/application/Espo/Services/Language.php
index efd1cdaaeb..19a494a252 100644
--- a/application/Espo/Services/Language.php
+++ b/application/Espo/Services/Language.php
@@ -134,11 +134,15 @@ class Language extends \Espo\Core\Services\Base
                     ],
                 ];
             }
-
-            $data['User']['fields']['password'] = $languageObj->translate('password', 'fields', 'User');
-            $data['User']['fields']['passwordConfirm'] = $languageObj->translate('passwordConfirm', 'fields', 'User');
         }
 
+        $data['User']['fields'] = $data['User']['fields'] ?? [];
+
+        $data['User']['fields']['password'] = $languageObj->translate('password', 'fields', 'User');
+        $data['User']['fields']['passwordConfirm'] = $languageObj->translate('passwordConfirm', 'fields', 'User');
+        $data['User']['fields']['newPassword'] = $languageObj->translate('newPassword', 'fields', 'User');
+        $data['User']['fields']['newPasswordConfirm'] = $languageObj->translate('newPasswordConfirm', 'fields', 'User');
+
         return $data;
     }
 }