diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java b/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
index 2fd97ce9..61410a30 100644
--- a/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
+++ b/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
@@ -65,11 +65,9 @@ public class WalletSetPasswordController {
             protected void onFinish(KeyParameter aesKey) {
                 // The actual encryption part doesn't take very long as most private keys are derived on demand.
                 Main.bitcoin.wallet().encrypt(scrypt, aesKey);
-                fadeIn(explanationLabel);
-                fadeIn(widgetGrid);
-                fadeIn(closeButton);
-                fadeOut(progressMeter);
-                fadeOut(padlockImage);
+                informationalAlert("Wallet encrypted",
+                        "You can remove the password at any time from the settings screen.");
+                overlayUI.done();
             }
         };
         progressMeter.progressProperty().bind(tasks.progress);
diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
index 38199b89..c5cc47b5 100644
--- a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
+++ b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
@@ -173,6 +173,7 @@ public class WalletSettingsController {
             Main.bitcoin.wallet().decrypt(aesKey);
             informationalAlert("Wallet decrypted", "A password will no longer be required to send money or edit settings.");
             passwordButton.setText("Set password");
+            aesKey = null;
         }
     }
 }