4 files changed, 11 insertions, 7 deletions
diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp
index 18c3cb5e..ba341dd2 100644
--- a/src/Main/Forms/AboutDialog.cpp
+++ b/src/Main/Forms/AboutDialog.cpp
@@ -57,7 +57,7 @@ namespace VeraCrypt
 			L"Paulo Barreto, Brian Gladman, Wei Dai, Peter Gutmann, and many others.\n\n"
 
 			L"Portions of this software:\n"
-			L"Copyright \xA9 2013-2021 IDRIX. All rights reserved.\n"
+			L"Copyright \xA9 2013-2022 IDRIX. All rights reserved.\n"
 			L"Copyright \xA9 2003-2012 TrueCrypt Developers Association. All Rights Reserved.\n"
 			L"Copyright \xA9 1998-2000 Paul Le Roux. All Rights Reserved.\n"
 			L"Copyright \xA9 1998-2008 Brian Gladman. All Rights Reserved.\n"
@@ -66,10 +66,11 @@ namespace VeraCrypt
 			L"Copyright \xA9 1999-2017 Dieter Baron and Thomas Klausner.\n"
 			L"Copyright \xA9 2013, Alexey Degtyarev. All rights reserved.\n"
 			L"Copyright \xA9 1999-2016 Jack Lloyd. All rights reserved.\n"
-			L"Copyright \xA9 2013-2019 Stephan Mueller <smueller@chronox.de>\n\n"
+			L"Copyright \xA9 2013-2019 Stephan Mueller <smueller@chronox.de>\n"
+			L"Copyright \xA9 1999-2021 Igor Pavlov\n\n"
 
 			L"\nThis software as a whole:\n"
-			L"Copyright \xA9 2013-2021 IDRIX. All rights reserved.\n\n"
+			L"Copyright \xA9 2013-2022 IDRIX. All rights reserved.\n\n"
 
 			L"This software uses wxWidgets library, which is copyright \xA9 1998-2011 Julian Smart, Robert Roebling et al.\n\n"
 
diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp
index 99355020..04410922 100644
--- a/src/Main/Forms/MountOptionsDialog.cpp
+++ b/src/Main/Forms/MountOptionsDialog.cpp
@@ -88,7 +88,8 @@ namespace VeraCrypt
 		OptionsButton->SetLabel (OptionsButtonLabel + L" >");
 		OptionsPanel->Show (false);
 
-		ProtectionPasswordPanel = new VolumePasswordPanel (OptionsPanel, &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, true, true, false, true, true, LangString["IDT_HIDDEN_PROT_PASSWD"]);
+		ProtectionPasswordPanel = new VolumePasswordPanel (ProtectionSizer->GetStaticBox(), &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, true, true, false, true, true, LangString["IDT_HIDDEN_PROT_PASSWD"]);
+		ProtectionPasswordPanel->TopOwnerParent = this;
 		ProtectionPasswordSizer->Add (ProtectionPasswordPanel, 1, wxALL | wxEXPAND);
 
 		UpdateDialog();
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp
index ac30075e..bb1f0c78 100644
--- a/src/Main/Forms/VolumePasswordPanel.cpp
+++ b/src/Main/Forms/VolumePasswordPanel.cpp
@@ -19,7 +19,7 @@
 namespace VeraCrypt
 {
 	VolumePasswordPanel::VolumePasswordPanel (wxWindow* parent, MountOptions* options, shared_ptr <VolumePassword> password, bool disableTruecryptMode, shared_ptr <KeyfileList> keyfiles, bool enableCache, bool enablePassword, bool enableKeyfiles, bool enableConfirmation, bool enablePkcs5Prf, bool isMountPassword, const wxString &passwordLabel)
-		: VolumePasswordPanelBase (parent), Keyfiles (new KeyfileList), EnablePimEntry (true)
+		: VolumePasswordPanelBase (parent), TopOwnerParent(NULL), Keyfiles (new KeyfileList), EnablePimEntry (true)
 	{
 		size_t maxPasswordLength = CmdLine->ArgUseLegacyPassword? VolumePassword::MaxLegacySize : VolumePassword::MaxSize;
 		if (keyfiles)
@@ -493,6 +493,7 @@ namespace VeraCrypt
 	{
 		if (EnablePimEntry)
 		{
+			wxWindow* layoutParent = TopOwnerParent? TopOwnerParent : GetParent();
 			PimCheckBox->Show (false);
 			VolumePimStaticText->Show (true);
 			VolumePimTextCtrl->Show (true);
@@ -506,8 +507,8 @@ namespace VeraCrypt
 				Fit();
 			}
 
-			GetParent()->Layout();
-			GetParent()->Fit();
+			layoutParent->Layout();
+			layoutParent->Fit();
 		}
 	}
 
diff --git a/src/Main/Forms/VolumePasswordPanel.h b/src/Main/Forms/VolumePasswordPanel.h
index cac6c37b..e9b81e29 100644
--- a/src/Main/Forms/VolumePasswordPanel.h
+++ b/src/Main/Forms/VolumePasswordPanel.h
@@ -45,6 +45,7 @@ namespace VeraCrypt
 		bool UpdatePimHelpText (bool pimChanged);
 
 		Event UpdateEvent;
+		wxWindow* TopOwnerParent; // use to handle layout when embedded inside sizer child
 
 	protected:
 		void SetPimValidator ();