diff --git a/lib/travis/web/set_token.rb b/lib/travis/web/set_token.rb
index 13a3222f..7a334bb6 100644
--- a/lib/travis/web/set_token.rb
+++ b/lib/travis/web/set_token.rb
@@ -17,8 +17,12 @@ module Travis
 
       def info_for(env)
         return unless env['REQUEST_METHOD'] == 'POST'
-        info = Rack::Request.new(env).params.values_at('token', 'user')
-        info if info.first =~ /\A[a-zA-Z\-_\d]+\Z/
+        request = Rack::Request.new(env)
+        token, user, storage = request.params.values_at('token', 'user', 'storage')
+        if token =~ /\A[a-zA-Z\-_\d]+\Z/
+          storage = 'sessionStorage' if storage.to_s.empty?
+          [storage, token, user, request.fullpath]
+        end
       end
     end
   end
@@ -26,7 +30,8 @@ end
 
 __END__
 <script>
-sessionStorage.setItem('travis.token', %p);
-sessionStorage.setItem('travis.user',  %p);
-window.location = '/';
+var storage = %s;
+storage.setItem('travis.token', %p);
+storage.setItem('travis.user',  %p);
+window.location = %p;
 </script>