diff --git a/electrum b/electrum
index fa11803e0..82bd509fa 100755
--- a/electrum
+++ b/electrum
@@ -349,23 +349,19 @@ if __name__ == '__main__':
 
     # commands needing password
     if cmd.requires_password:
-        if wallet.seed == '':
-            seed = ''
-            password = None
-        elif wallet.use_encryption:
+        if wallet.use_encryption:
             password = prompt_password('Password:', False)
             if not password:
                 print_msg("Error: Password required")
                 sys.exit(1)
             # check password
             try:
-                seed = wallet.get_seed(password)
+                seed = wallet.check_password(password)
             except InvalidPassword:
                 print_msg("Error: This password does not decode this wallet.")
                 sys.exit(1)
         else:
             password = None
-            seed = wallet.get_seed(None)
     else:
         password = None
 
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 5d3d97093..7e6b0e115 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -2320,7 +2320,7 @@ class ElectrumWindow(QMainWindow):
             return
 
         try:
-            mnemonic = self.wallet.get_mnemonic(password)
+            self.wallet.check_password(password)
         except Exception as e:
             QMessageBox.warning(self, _('Error'), str(e), _('OK'))
             return