2 files changed, 4 insertions, 3 deletions
diff --git a/src/frontend/checkout.php b/src/frontend/checkout.php
index 2f0cc7e9..15f0e356 100644
--- a/src/frontend/checkout.php
+++ b/src/frontend/checkout.php
@@ -171,8 +171,6 @@ function test_without_wallet(){
   tbutton.removeAttribute("disabled");
 };
 
-test_without_wallet();
-
 // Register event to be triggered by the wallet as a response to our
 // first event
 document.body.addEventListener("taler-wallet-present",
diff --git a/src/frontend/index.html b/src/frontend/index.html
index a0023c93..4f22750b 100644
--- a/src/frontend/index.html
+++ b/src/frontend/index.html
@@ -151,11 +151,14 @@
       //alert("signaling");
     };
 
-
     function test_without_wallet(){
         wallet_installed_cb();
     }
 
+    document.body.addEventListener("taler-unload", 
+                                   wallet_uninstalled_cb, 
+                                   false, false);
+
     /* Set up a listener to be called whenever a Wallet gets installed
        so that the user is led towards the demo's steps progressively */
     document.body.addEventListener("taler-wallet-present",