diff --git a/gui/kivy/uix/dialogs/installwizard.py b/gui/kivy/uix/dialogs/installwizard.py
index 4afe216e..886b4ce3 100644
--- a/gui/kivy/uix/dialogs/installwizard.py
+++ b/gui/kivy/uix/dialogs/installwizard.py
@@ -808,7 +808,7 @@ class InstallWizard(BaseWizard, Widget):
             if pin:
                 self.run('confirm_password', pin, run_next)
             else:
-                run_next(None)
+                run_next(None, None)
         self.password_dialog('Choose a PIN code', callback)
 
     def confirm_password(self, pin, run_next):
diff --git a/gui/kivy/uix/dialogs/password_dialog.py b/gui/kivy/uix/dialogs/password_dialog.py
index eb3a44c9..274b8a18 100644
--- a/gui/kivy/uix/dialogs/password_dialog.py
+++ b/gui/kivy/uix/dialogs/password_dialog.py
@@ -70,6 +70,7 @@ Builder.load_string('''
                 text: _('Cancel')
                 on_release:
                     popup.dismiss()
+                    popup.callback(None)
 ''')