diff --git a/electrum/gui/qt/password_dialog.py b/electrum/gui/qt/password_dialog.py
index 2f2c9aed3..017a348e5 100644
--- a/electrum/gui/qt/password_dialog.py
+++ b/electrum/gui/qt/password_dialog.py
@@ -57,6 +57,8 @@ def check_password_strength(password):
 
 PW_NEW, PW_CHANGE, PW_PASSPHRASE = range(0, 3)
 
+MSG_ENTER_PASSWORD = _("Choose a password to encrypt your wallet keys.") + '\n'\
+                     + _("Leave this field empty if you want to disable encryption.")
 
 class PasswordLayout(object):
 
diff --git a/electrum/gui/qt/seed_dialog.py b/electrum/gui/qt/seed_dialog.py
index fd3022a63..4f18d02d0 100644
--- a/electrum/gui/qt/seed_dialog.py
+++ b/electrum/gui/qt/seed_dialog.py
@@ -46,6 +46,14 @@ if TYPE_CHECKING:
     from electrum.simple_config import SimpleConfig
 
 
+MSG_PASSPHRASE_WARN_ISSUE4566 = _("Warning") + ": "\
+                              + _("You have multiple consecutive whitespaces or leading/trailing "
+                                  "whitespaces in your passphrase.") + " " \
+                              + _("This is discouraged.") + " " \
+                              + _("Due to a bug, old versions of Electrum will NOT be creating the "
+                                  "same wallet as newer versions or other software.")
+
+
 def seed_warning_msg(seed):
     return ''.join([
         "<p>",
diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py
index 259121839..da8f1eba0 100644
--- a/electrum/gui/qt/wizard/wallet.py
+++ b/electrum/gui/qt/wizard/wallet.py
@@ -12,8 +12,8 @@ from .wizard import QEAbstractWizard, WizardComponent
 from electrum.logging import get_logger
 from electrum import WalletStorage, mnemonic
 from electrum.wizard import NewWalletWizard
-from ..installwizard import MSG_PASSPHRASE_WARN_ISSUE4566
-from ..seed_dialog import SeedLayout
+from ..password_dialog import PasswordLayout, PW_NEW, MSG_ENTER_PASSWORD
+from ..seed_dialog import SeedLayout, MSG_PASSPHRASE_WARN_ISSUE4566
 from ..util import ChoicesLayout, PasswordLineEdit, char_width_in_lineedit, WWLabel