diff --git a/gui/gui_classic.py b/gui/gui_classic.py
index 53ce98f9..1bebc903 100644
--- a/gui/gui_classic.py
+++ b/gui/gui_classic.py
@@ -2273,7 +2273,7 @@ class ElectrumGui:
         storage = WalletStorage(self.config)
         if not storage.file_exists:
             import installwizard
-            wizard = installwizard.InstallWizard(self.config, self.interface, self.blockchain, storage)
+            wizard = installwizard.InstallWizard(self.config, self.network, storage)
             wallet = wizard.run()
             if not wallet: 
                 exit()
diff --git a/gui/installwizard.py b/gui/installwizard.py
index 8abd1b8b..6065735a 100644
--- a/gui/installwizard.py
+++ b/gui/installwizard.py
@@ -14,11 +14,12 @@ import sys
 
 class InstallWizard(QDialog):
 
-    def __init__(self, config, interface, blockchain, storage):
+    def __init__(self, config, network, storage):
         QDialog.__init__(self)
         self.config = config
-        self.interface = interface
-        self.blockchain = blockchain
+        self.network = network
+        self.interface = network.interface
+        self.blockchain = network.blockchain
         self.storage = storage
 
 
@@ -330,7 +331,7 @@ class InstallWizard(QDialog):
         self.network_dialog()
 
         # start wallet threads
-        wallet.start_threads(self.interface, self.blockchain)
+        wallet.start_threads(self.network)
 
         if action == 'restore':
             try:
diff --git a/gui/password_dialog.py b/gui/password_dialog.py
index 18922334..5e180ed3 100644
--- a/gui/password_dialog.py
+++ b/gui/password_dialog.py
@@ -94,7 +94,10 @@ class PasswordDialog(QDialog):
             QMessageBox.warning(self.parent, _('Error'), _('Failed to update password'), _('OK'))
             return
 
-        QMessageBox.information(self.parent, _('Success'), _('Password was updated successfully'), _('OK'))
+        if new_password:
+            QMessageBox.information(self.parent, _('Success'), _('Password was updated successfully'), _('OK'))
+        else:
+            QMessageBox.information(self.parent, _('Success'), _('This wallet is not encrypted'), _('OK'))
 
 
 
diff --git a/lib/wallet.py b/lib/wallet.py
index 7a98afc0..b247bfd7 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -391,7 +391,7 @@ class Wallet:
 
 
     def set_label(self, key, value):
-        self.labels[account_id] = name
+        self.labels[key] = value
         self.storage.put('labels', self.labels, True)