diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js
index c9a7110c8..7810771b8 100644
--- a/src/js/services/popupService.js
+++ b/src/js/services/popupService.js
@@ -34,6 +34,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
     $ionicPopup.prompt({
       title: title,
       subTitle: message,
+      cssClass: opts.class,
       template: '<input ng-model="data.response" type="' + opts.inputType + '" autofocus>',
       inputPlaceholder: opts.inputPlaceholder,
       defaultText: opts.defaultText
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index d45bccbe2..4546dc4af 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -827,7 +827,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
   var askPassword = function(name, title, cb) {
     var opts = {
       inputType: 'password',
-      forceHTMLPrompt: true
+      forceHTMLPrompt: true,
+      class: 'text-warn'
     };
     popupService.showPrompt(title, name, opts, function(res) {
       if (!res) return cb();
@@ -838,10 +839,11 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
 
   root.encrypt = function(wallet, cb) {
     var title = gettextCatalog.getString('Enter new spending password');
-    askPassword(wallet.name, title, function(password) {
+    var warnMsg = gettextCatalog.getString('Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down.');
+    askPassword(warnMsg, title, function(password) {
       if (!password) return cb('no password');
       title = gettextCatalog.getString('Confirm you new spending password');
-      askPassword(wallet.name, gettextCatalog.getString('Confirm you new spending password'), function(password2) {
+      askPassword(warnMsg, gettextCatalog.getString('Confirm you new spending password'), function(password2) {
         if (!password2 || password != password2)
           return cb('password mismatch');
 
@@ -854,7 +856,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
 
   root.decrypt = function(wallet, cb) {
     $log.debug('Disabling private key encryption for' + wallet.name);
-    askPassword(wallet.name, gettextCatalog.getString('Enter Spending Password'), function(password) {
+    askPassword(null, gettextCatalog.getString('Enter Spending Password'), function(password) {
       if (!password) return cb('no password');
 
       try {
diff --git a/src/sass/shame.scss b/src/sass/shame.scss
index 7ee9f7499..4100069e0 100644
--- a/src/sass/shame.scss
+++ b/src/sass/shame.scss
@@ -30,6 +30,13 @@
   }
 }
 
+.text-warn {
+  .popup-sub-title {
+    margin-top: 15px;
+    color: #e42112 !important;
+  }
+}
+
 .item-toggle, .item {
   white-space: normal;
 }