diff --git a/source/change_password.dfm b/source/change_password.dfm
index 29cb85b5..fcee57d3 100644
--- a/source/change_password.dfm
+++ b/source/change_password.dfm
@@ -17,6 +17,7 @@ object frmPasswordChange: TfrmPasswordChange
   Font.Style = []
   OldCreateOrder = False
   Position = poMainFormCenter
+  OnCreate = FormCreate
   OnShow = FormShow
   DesignSize = (
     456
diff --git a/source/change_password.pas b/source/change_password.pas
index 0d908df3..bdf6bb68 100644
--- a/source/change_password.pas
+++ b/source/change_password.pas
@@ -37,6 +37,7 @@ type
     procedure menuPasswordClick(Sender: TObject);
     procedure menuPasswordInsert(Sender: TObject);
     procedure btnCopyToClipboardClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
   private
     { Private-Deklarationen }
     procedure CheckPasswordStrength;
@@ -54,6 +55,13 @@ uses main, helpers;
 {$R *.dfm}
 
 
+procedure TfrmPasswordChange.FormCreate(Sender: TObject);
+begin
+  TranslateComponent(Self);
+  InheritFont(Font);
+end;
+
+
 procedure TfrmPasswordChange.FormShow(Sender: TObject);
 begin
   // Manually trigger change event on password box