diff --git a/gui/gui_classic/main_window.py b/gui/gui_classic/main_window.py
index 42c33912..d199cdd0 100644
--- a/gui/gui_classic/main_window.py
+++ b/gui/gui_classic/main_window.py
@@ -2107,20 +2107,6 @@ class ElectrumWindow(QMainWindow):
             self.update_history_tab()
             self.update_status()
         
-        try:
-            n = int(gap_e.text())
-        except:
-            QMessageBox.warning(self, _('Error'), _('Invalid value'), _('OK'))
-            return
-
-        if self.wallet.gap_limit != n:
-            r = self.wallet.change_gap_limit(n)
-            if r:
-                self.update_receive_tab()
-                self.config.set_key('gap_limit', self.wallet.gap_limit, True)
-            else:
-                QMessageBox.warning(self, _('Error'), _('Invalid value'), _('OK'))
-
         need_restart = False
 
         lang_request = languages.keys()[lang_combo.currentIndex()]
diff --git a/gui/gui_classic/password_dialog.py b/gui/gui_classic/password_dialog.py
index 73c51da3..22cf70ea 100644
--- a/gui/gui_classic/password_dialog.py
+++ b/gui/gui_classic/password_dialog.py
@@ -103,9 +103,9 @@ class PasswordDialog(QDialog):
     def run(self):
         new_password = run_password_dialog(self, self.wallet, self.parent)
         if new_password:
-            QMessageBox.information(parent, _('Success'), _('Password was updated successfully'), _('OK'))
+            QMessageBox.information(self.parent, _('Success'), _('Password was updated successfully'), _('OK'))
         else:
-            QMessageBox.information(parent, _('Success'), _('This wallet is not encrypted'), _('OK'))
+            QMessageBox.information(self.parent, _('Success'), _('This wallet is not encrypted'), _('OK'))