diff --git a/gui/kivy/uix/dialogs/password_dialog.py b/gui/kivy/uix/dialogs/password_dialog.py
index 495cbd3a..eb3a44c9 100644
--- a/gui/kivy/uix/dialogs/password_dialog.py
+++ b/gui/kivy/uix/dialogs/password_dialog.py
@@ -79,7 +79,6 @@ class PasswordDialog(Factory.Popup):
     #    Factory.Popup.__init__(self)
 
     def init(self, message, callback):
-        self.pw = None
         self.message = message
         self.callback = callback
         self.ids.kb.password = ''
@@ -97,8 +96,5 @@ class PasswordDialog(Factory.Popup):
 
     def on_password(self, pw):
         if len(pw) == 6:
-            self.pw = pw
             self.dismiss()
-
-    def on_dismiss(self):
-        Clock.schedule_once(lambda dt: self.callback(self.pw), 0.1)
+            Clock.schedule_once(lambda dt: self.callback(pw), 0.1)