diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs
index f4fe40f16..70d36d820 100644
--- a/mRemoteV1/Resources/Language/Language.Designer.cs
+++ b/mRemoteV1/Resources/Language/Language.Designer.cs
@@ -4172,6 +4172,15 @@ namespace mRemoteNG {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to New Password.
+        /// </summary>
+        internal static string strNewPassword {
+            get {
+                return ResourceManager.GetString("strNewPassword", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to New Root.
         /// </summary>
@@ -4614,6 +4623,15 @@ namespace mRemoteNG {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Passwords don&apos;t macht!.
+        /// </summary>
+        internal static string strPasswordsDontMatch {
+            get {
+                return ResourceManager.GetString("strPasswordsDontMatch", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Both passwords must match..
         /// </summary>
@@ -7802,6 +7820,15 @@ namespace mRemoteNG {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Verify Password.
+        /// </summary>
+        internal static string strVerifyPassword {
+            get {
+                return ResourceManager.GetString("strVerifyPassword", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Version.
         /// </summary>
diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx
index 1ff2d3430..ee384bb95 100644
--- a/mRemoteV1/Resources/Language/Language.de.resx
+++ b/mRemoteV1/Resources/Language/Language.de.resx
@@ -2440,8 +2440,7 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat
     <value>Warnung! Ein Neustart ist notwendig um ein Theme zu deaktivieren oder anzuwenden</value>
   </data>
   <data name="strOptionsThemeErrorNoThemes" xml:space="preserve">
-    <value>
-Es werden keine Themes geladen, vergewissern Sie sich, dass das standard mremoteNG-Theme im Ordner 'themes' vorhanden ist</value>
+    <value>Es werden keine Themes geladen, vergewissern Sie sich, dass das standard mremoteNG-Theme im Ordner 'themes' vorhanden ist</value>
   </data>
   <data name="LoginFailedForUser" xml:space="preserve">
     <value>Login fehlgeschlagen für Benutzer '{0}'.</value>
@@ -2619,4 +2618,43 @@ Wählen Sie einen Pfad für die mRemoteNG-Protokolldatei</value>
   <data name="Lock" xml:space="preserve">
     <value>Sperren</value>
   </data>
+  <data name="strEditRecord" xml:space="preserve">
+    <value>Bearbeite Eintrag</value>
+  </data>
+  <data name="strEdit" xml:space="preserve">
+    <value>Bearbeiten</value>
+  </data>
+  <data name="strContinue" xml:space="preserve">
+    <value>Weiter</value>
+  </data>
+  <data name="strAutoCloseDialog" xml:space="preserve">
+    <value>Dieses Fenster automatisch schließen, nachdem das letzte Repository entsperrt wurde</value>
+  </data>
+  <data name="strAddRepo" xml:space="preserve">
+    <value>Repository hinzufügen</value>
+  </data>
+  <data name="strAddRecord" xml:space="preserve">
+    <value>Eintrag hinzufügen</value>
+  </data>
+  <data name="strCredentialsFound" xml:space="preserve">
+    <value>Gefundene Anmeldedaten</value>
+  </data>
+  <data name="strRemoveRepo" xml:space="preserve">
+    <value>Repository entfernen</value>
+  </data>
+  <data name="strLockRepo" xml:space="preserve">
+    <value>Repository sperren</value>
+  </data>
+  <data name="strNewPassword" xml:space="preserve">
+    <value>Neues Passwort</value>
+  </data>
+  <data name="strUnlockRepo" xml:space="preserve">
+    <value>Repository entsperren</value>
+  </data>
+  <data name="strRemoveRecord" xml:space="preserve">
+    <value>Eintrag entfernen</value>
+  </data>
+  <data name="strEditRepo" xml:space="preserve">
+    <value>Repository bearbeiten</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/Resources/Language/Language.fr.resx b/mRemoteV1/Resources/Language/Language.fr.resx
index 84fe5c4b5..52fba710b 100644
--- a/mRemoteV1/Resources/Language/Language.fr.resx
+++ b/mRemoteV1/Resources/Language/Language.fr.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2153,4 +2153,7 @@ Message:
   <data name="strYes" xml:space="preserve">
     <value>Oui</value>
   </data>
+  <data name="strVerifyPassword" xml:space="preserve">
+    <value>Passwort bestätigen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx
index 95ec61ead..04547a889 100644
--- a/mRemoteV1/Resources/Language/Language.resx
+++ b/mRemoteV1/Resources/Language/Language.resx
@@ -2788,4 +2788,13 @@ This page will walk you through the process of upgrading your connections file o
   <data name="strUnlockRepo" xml:space="preserve">
     <value>Unlock Repository</value>
   </data>
+  <data name="strNewPassword" xml:space="preserve">
+    <value>New Password</value>
+  </data>
+  <data name="strPasswordsDontMatch" xml:space="preserve">
+    <value>Passwords don't macht!</value>
+  </data>
+  <data name="strVerifyPassword" xml:space="preserve">
+    <value>Verify Password</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/UI/Controls/NewPasswordWithVerification.cs b/mRemoteV1/UI/Controls/NewPasswordWithVerification.cs
index 109a92fdc..f50abfb0b 100644
--- a/mRemoteV1/UI/Controls/NewPasswordWithVerification.cs
+++ b/mRemoteV1/UI/Controls/NewPasswordWithVerification.cs
@@ -44,6 +44,7 @@ namespace mRemoteNG.UI.Controls
         public NewPasswordWithVerification()
         {
             InitializeComponent();
+            ApplyLanguage();
             var display = new DisplayProperties();
             secureTextBox1.Width = display.ScaleWidth(Width);
             secureTextBox2.Width = display.ScaleWidth(Width);
@@ -58,6 +59,13 @@ namespace mRemoteNG.UI.Controls
             secureTextBox2.Text = text;
         }
 
+        private void ApplyLanguage()
+        {
+            labelFirstPasswordBox.Text = Language.strNewPassword;
+            labelSecondPasswordBox.Text = Language.strVerifyPassword;
+            labelPasswordsDontMatch.Text = Language.strPasswordsDontMatch;
+        }
+
         private bool Verify()
         {
             return secureTextBox1.SecString.Length == secureTextBox2.SecString.Length &&
diff --git a/mRemoteV1/UI/Forms/CredentialManagerUpgradeForm.cs b/mRemoteV1/UI/Forms/CredentialManagerUpgradeForm.cs
index 2be3d8a0b..649d3e04c 100644
--- a/mRemoteV1/UI/Forms/CredentialManagerUpgradeForm.cs
+++ b/mRemoteV1/UI/Forms/CredentialManagerUpgradeForm.cs
@@ -122,6 +122,8 @@ namespace mRemoteNG.UI.Forms
             colUsername.Text = Language.strPropertyNameUsername;
             colDomain.Text = Language.strPropertyNameDomain;
             colPassword.Text = Language.strPropertyNamePassword;
+            btnCredsBack.Text = Language.strBack;
+            btnCredsContinue.Text = Language.strContinue;
 
             // SaveRepo tab
             labelConfConsPathHeaderOnTab2.Text = $@"{Language.strConnectionFilePath}:";