diff --git a/client/electrum4a.py b/client/electrum4a.py
index 46f803c44..440e3617d 100755
--- a/client/electrum4a.py
+++ b/client/electrum4a.py
@@ -693,9 +693,12 @@ def change_password_dialog():
         modal_dialog('error','passwords do not match')
         return
 
+    wallet.update_password(seed, new_password)
     if new_password:
-        wallet.update_password(seed, new_password)
-
+        modal_dialog('Password updated','your wallet is encrypted')
+    else:
+        modal_dialog('Password removed','your wallet is not encrypted')
+        
 
 def settings_loop():
     droid.fullSetProperty("server","text",wallet.server)