diff --git a/app/assets/javascripts/user/app/app.js.coffee b/app/assets/javascripts/user/app/app.js.coffee
index 0967c4ee..6d55463c 100644
--- a/app/assets/javascripts/user/app/app.js.coffee
+++ b/app/assets/javascripts/user/app/app.js.coffee
@@ -17,21 +17,13 @@
     # $('body').append frame
     # window.location = "#{$obtain_token_url}"
     auth_win = window.open $obtain_token_url, "_blank", "location=no"
-    auth_win.addEventListener "loadstop", ->
-      # auth_win.executeScript(code: "localStorage.setItem( 'name', '' );")
-      watch_loop = setInterval ->
-        auth_win.executeScript {code: "localStorage.getItem( 'auth_token' )"}, (values)->
-          token = values[0]
-          if token
-            clearInterval( watch_loop )
-            auth_win.executeScript {code: "localStorage.setItem('auth_token', '');"}
-            auth_win.executeScript {code: "localStorage.getItem( 'user_id' )"}, (user_id_values)->
-              user_id = user_id_values[0]
-              Qstorage.setItem 'user_id', user_id
-              Qstorage.setItem 'auth_token', token
-            auth_win.close()
-      , 200
-
+    auth_win.addEventListener "loadstart", (event)->
+      if event.url.match 'close_window'
+        user_id = event.url.match(/user_id=([\w+-]+)/)[1]
+        auth_token = event.url.match(/auth_token=([\w-]+)/)[1]
+        Qstorage.setItem 'user_id', user_id
+        Qstorage.setItem 'auth_token', token
+        auth_win.close()
 
 Ember.$.ajaxPrefilter (options) ->
   if options.type.toUpperCase() == 'GET'
diff --git a/app/views/user/obtain_token.html.slim b/app/views/user/obtain_token.html.slim
index e638faf3..54fbe01f 100644
--- a/app/views/user/obtain_token.html.slim
+++ b/app/views/user/obtain_token.html.slim
@@ -4,10 +4,8 @@
 - if current_user.present?
   p Waiting for authentication to complete.....
   javascript:
-    Qstorage = window.localStorage;
-    Qstorage.setItem('auth_token', '#{current_user.authentication_token}');
-    Qstorage.setItem('user_id', '#{current_user.id}');
-    if(!window.opener || window.opener != window) window.close();
+    window.location.href = "/close_window?user_id=#{current_user.id}&authentication_token=#{current_user.authentication_token}"
+    // if(!window.opener || window.opener != window) window.close();
     // window.location = (Qstorage.getItem('root_url') || '/user/index.html') + '?user_id=#{current_user.id}&auth_token=#{current_user.authentication_token}';
     // localStorage.setItem('auth_token', '#{current_user.authentication_token}');
     // localStorage.setItem('user_id', '#{current_user.id}');
diff --git a/wip.md b/wip.md
index 38547f27..0843003e 100644
--- a/wip.md
+++ b/wip.md
@@ -18,12 +18,14 @@ User
 ----
 
 - test met veel producten
-- Change language
+- Only show join requests menu when there actually are join requests
 
 Bugs
 ----
 
-- nothing!!!
+<!-- - nothing!!! -->
+
+- User order added, not added for other users
 
 Post release
 ============