diff --git a/wizard/WizardAskPassword.qml b/wizard/WizardAskPassword.qml
index 57a7876b..b0efd83d 100644
--- a/wizard/WizardAskPassword.qml
+++ b/wizard/WizardAskPassword.qml
@@ -104,7 +104,6 @@ ColumnLayout {
             labelFontSize: 14
             password: true
             labelText: qsTr("Password") + translationManager.emptyString
-            text: walletOptionsPassword
         }
 
         ColumnLayout {
@@ -170,7 +169,6 @@ ColumnLayout {
             labelFontSize: 14
             passwordLinked: passwordInput
             labelText: qsTr("Password (confirm)") + translationManager.emptyString
-            text: walletOptionsPassword
             onTextChanged:{
                 if (passwordInputConfirm.text.length == passwordInput.text.length) {
                     firstUserInput = false;
diff --git a/wizard/WizardCreateWallet1.qml b/wizard/WizardCreateWallet1.qml
index c1ecf026..088df200 100644
--- a/wizard/WizardCreateWallet1.qml
+++ b/wizard/WizardCreateWallet1.qml
@@ -194,6 +194,8 @@ Rectangle {
                 btnNext.enabled: walletInput.verify();
                 btnPrev.text: qsTr("Back to menu") + translationManager.emptyString
                 onPrevClicked: {
+                    wizardController.wizardStateView.wizardCreateWallet2View.pwField = "";
+                    wizardController.wizardStateView.wizardCreateWallet2View.pwConfirmField = "";
                     wizardStateView.state = "wizardHome";
                 }
                 onNextClicked: {
diff --git a/wizard/WizardCreateWallet2.qml b/wizard/WizardCreateWallet2.qml
index 74fb1df0..72a8f71a 100644
--- a/wizard/WizardCreateWallet2.qml
+++ b/wizard/WizardCreateWallet2.qml
@@ -38,6 +38,8 @@ Rectangle {
     color: "transparent"
     property alias pageHeight: pageRoot.height
     property string viewName: "wizardCreateWallet2"
+    property alias pwField: passwordFields.password
+    property alias pwConfirmField: passwordFields.passwordConfirm
 
     ColumnLayout {
         id: pageRoot
@@ -64,9 +66,6 @@ Rectangle {
                 progress: 1
                 btnNext.enabled: passwordFields.calcStrengthAndVerify();
                 onPrevClicked: {
-                    passwordFields.password = "";
-                    passwordFields.passwordConfirm = "";
-
                     if(wizardController.walletOptionsIsRecoveringFromDevice){
                         wizardStateView.state = "wizardCreateDevice1";
                     } else {
diff --git a/wizard/WizardCreateWallet4.qml b/wizard/WizardCreateWallet4.qml
index df05de85..33c1e926 100644
--- a/wizard/WizardCreateWallet4.qml
+++ b/wizard/WizardCreateWallet4.qml
@@ -77,6 +77,8 @@ Rectangle {
                     }
                 }
                 onNextClicked: {
+                    wizardController.wizardStateView.wizardCreateWallet2View.pwField = "";
+                    wizardController.wizardStateView.wizardCreateWallet2View.pwConfirmField = "";
                     wizardController.writeWallet(function() {
                         wizardController.useMoneroClicked();
                         wizardController.walletOptionsIsRecoveringFromDevice = false;
diff --git a/wizard/WizardRestoreWallet1.qml b/wizard/WizardRestoreWallet1.qml
index 075a4d5a..9ac92500 100644
--- a/wizard/WizardRestoreWallet1.qml
+++ b/wizard/WizardRestoreWallet1.qml
@@ -296,6 +296,8 @@ Rectangle {
                 btnNext.enabled: wizardRestoreWallet1.verify();
                 btnPrev.text: qsTr("Back to menu") + translationManager.emptyString
                 onPrevClicked: {
+                    wizardController.wizardStateView.wizardRestoreWallet2View.pwField = "";
+                    wizardController.wizardStateView.wizardRestoreWallet2View.pwConfirmField = "";
                     wizardStateView.state = "wizardHome";
                 }
                 onNextClicked: {
diff --git a/wizard/WizardRestoreWallet2.qml b/wizard/WizardRestoreWallet2.qml
index 8251d6b7..0bb9a0e6 100644
--- a/wizard/WizardRestoreWallet2.qml
+++ b/wizard/WizardRestoreWallet2.qml
@@ -41,6 +41,9 @@ Rectangle {
     property alias pageHeight: pageRoot.height
     property string viewName: "wizardRestoreWallet2"
     property int recoveryMode: 1
+    property alias pwField: passwordFields.password
+    property alias pwConfirmField: passwordFields.passwordConfirm
+
 
     ColumnLayout {
         id: pageRoot
@@ -67,9 +70,6 @@ Rectangle {
                 progress: 1
                 btnNext.enabled: passwordFields.calcStrengthAndVerify();
                 onPrevClicked: {
-                    passwordFields.password = "";
-                    passwordFields.passwordConfirm = "";
-
                     wizardStateView.state = "wizardRestoreWallet1";
                 }
                 onNextClicked: {
diff --git a/wizard/WizardRestoreWallet4.qml b/wizard/WizardRestoreWallet4.qml
index 1f22314a..091c143f 100644
--- a/wizard/WizardRestoreWallet4.qml
+++ b/wizard/WizardRestoreWallet4.qml
@@ -77,6 +77,8 @@ Rectangle {
                     }
                 }
                 onNextClicked: {
+                    wizardController.wizardStateView.wizardRestoreWallet2View.pwField = "";
+                    wizardController.wizardStateView.wizardRestoreWallet2View.pwConfirmField = "";
                     wizardController.recoveryWallet();
                     wizardController.writeWallet(function() {
                         wizardController.useMoneroClicked();