diff --git a/client/index.html b/client/index.html
index def16ac..eaf9180 100755
--- a/client/index.html
+++ b/client/index.html
@@ -17,13 +17,15 @@
 <script src="js/app.js"></script>
 <script>
 
+    // Get your Connected App id from the server
     $.ajax({url: '/appid'}).done(function(result) {
 
-        // Initialize forcejs here
+        // Initialize forcejs for that Connected app
         force.init({
             appId: result.appId
         });
 
+        // Login
         force.login(router.start, function (error) {
             alert('Login failed: ' + error);
         });
diff --git a/client/oauthcallback.html b/client/oauthcallback.html
index fafec9c..6ec6685 100755
--- a/client/oauthcallback.html
+++ b/client/oauthcallback.html
@@ -1,11 +1,7 @@
 <html>
 <body>
 <script>
-    if (window.opener.force && window.opener.force.oauthCallback) {
-        window.opener.force.oauthCallback(window.location.href);
-    } else if (window.opener.oauthCallback) {
-        window.opener.oauthCallback(window.location.href);
-    }
+    window.opener.force.oauthCallback(window.location.href);
     window.close();
 </script>
 </body>
