diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 88ca61026df..0f44c9b860d 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -95,11 +95,10 @@ class Session(openerpweb.Controller):
     @openerpweb.jsonrequest
     def login(self, req, db, login, password):
         req.session.login(db, login, password)
-        res = {
+        return {
             "session_id" : req.session_id,
             "uid": req.session._uid,
         }
-        return res
 
     @openerpweb.jsonrequest
     def modules(self, req):
diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js
index b336f0144b5..269efd6b6e2 100644
--- a/addons/base/static/openerp/js/base_chrome.js
+++ b/addons/base/static/openerp/js/base_chrome.js
@@ -124,6 +124,7 @@ openerp.base.Session = openerp.base.BasicController.extend({
         this.password = "";
         this.uid = false;
         this.session_id = false;
+        this.load_local();
         this.module_list = [];
         this.module_loaded = {"base": true};
         this.context = {};
@@ -140,6 +141,52 @@ openerp.base.Session = openerp.base.BasicController.extend({
             }
         });
     },
+    /**
+     * Reloads uid and session_id from local storage, if they exist
+     */
+    load_local: function () {
+        this.uid = this.get_cookie('uid');
+        this.session_id = this.get_cookie('session_id');
+    },
+    /**
+     * Saves the session id and uid locally
+     */
+    save_local: function () {
+        this.set_cookie('uid', this.uid);
+        this.set_cookie('session_id', this.session_id);
+    },
+    // TODO: clear_local
+    /**
+     * Fetches a cookie stored by an openerp session
+     *
+     * @param name the cookie's name
+     */
+    get_cookie: function (name) {
+        var nameEQ = this.element_id + '|' + name + '=';
+        var cookies = document.cookie.split(';');
+        for(var i=0; i<cookies.length; ++i) {
+            var cookie = cookies[i].replace(/^\s*/, '');
+            if(cookie.indexOf(nameEQ) === 0) {
+                return decodeURIComponent(cookie.substring(nameEQ.length));
+            }
+        }
+        return null;
+    },
+    /**
+     * Create a new secure cookie with the provided name and value
+     *
+     * @param name the cookie's name
+     * @param value the cookie's value
+     * @param ttl the cookie's time to live, 1 year by default, set to -1 to delete
+     */
+    set_cookie: function (name, value, ttl) {
+        ttl = ttl || 24*60*60*365;
+        document.cookie = [
+            this.element_id + '|' + name + '=' + encodeURIComponent(value),
+            'max-age=' + ttl,
+            'expires=' + new Date(new Date().getTime() + ttl*1000).toGMTString()
+        ].join(';');
+    },
     rpc: function(url, params, success_callback, error_callback) {
         // Construct a JSON-RPC2 request, method is currently unused
         params.session_id = this.session_id;
@@ -172,7 +219,7 @@ openerp.base.Session = openerp.base.BasicController.extend({
                     if (response.error.data.type == "session_invalid") {
                         self.uid = false;
                         self.on_session_invalid(function() {
-                            self.rpc(url, params, success_callback, error_callback);
+                            self.rpc(url, payload.params, success_callback, error_callback);
                         });
                     } else {
                         error_callback(response.error);
@@ -198,7 +245,7 @@ openerp.base.Session = openerp.base.BasicController.extend({
     },
     on_rpc_error: function(error) {
         // TODO this should use the $element with focus and button is displaying OPW etc...
-        this.on_log(error.message, error.data);
+        this.on_log(error.message, error.data.debug);
     },
     on_session_invalid: function(contination) {
     },
@@ -214,6 +261,7 @@ openerp.base.Session = openerp.base.BasicController.extend({
         this.rpc("/base/session/login", params, function(result) {
             self.session_id = result.session_id;
             self.uid = result.uid;
+            self.save_local();
             self.session_check_modules();
             if (success_callback)
                 success_callback();
@@ -230,7 +278,6 @@ openerp.base.Session = openerp.base.BasicController.extend({
             self.rpc('/base/session/jslist', {"mods": self.module_list.join(',')}, self.debug ? self.do_session_load_modules_debug : self.do_session_load_modules_prod);
             openerp._modules_loaded = true;
         });
-        this.uid = false;
     },
     do_session_load_modules_debug: function(result) {
         var self = this;
@@ -320,22 +367,22 @@ openerp.base.Login =  openerp.base.Controller.extend({
     },
     start: function() {
         this.$element.html(QWeb.render("Login", {}));
-        //this.on_login_invalid();
         this.$element.find("form").submit(this.on_submit);
     },
     on_login_invalid: function() {
-        var $e = this.$element;
-        $e.removeClass("login_valid");
-        $e.addClass("login_invalid");
-        $e.show();
+        this.$element
+            .removeClass("login_valid")
+            .addClass("login_invalid")
+            .show();
     },
     on_login_valid: function() {
-        var $e = this.$element;
-        $e.removeClass("oe_login_invalid");
-        $e.addClass("login_valid");
-        $e.hide();
+        this.$element
+            .addClass("login_valid")
+            .removeClass("login_invalid")
+            .hide();
     },
     on_submit: function(ev) {
+        ev.preventDefault();
         var self = this;
         var $e = this.$element;
         var db = $e.find("form input[name=db]").val();
@@ -350,17 +397,14 @@ openerp.base.Login =  openerp.base.Controller.extend({
                 self.on_login_invalid();
             }
         });
-        return false;
     },
     do_ask_login: function(continuation) {
         this.on_login_invalid();
-        this.on_submit.add({
+        this.on_login_valid.add({
             position: "last",
             unique: true,
-            callback: function() {
-                if(continuation) continuation();
-                return false;
-            }});
+            callback: continuation
+        });
     }
 });
 
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 3d0db1cea14..a43b56e5ffc 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import functools
 
-import optparse, os, re, sys, traceback, xmlrpclib
+import optparse, os, re, sys, tempfile, traceback, uuid, xmlrpclib
 
 import cherrypy
 import cherrypy.lib.static
@@ -64,7 +64,6 @@ class OpenERPSession(object):
 #----------------------------------------------------------
 # OpenERP Web RequestHandler
 #----------------------------------------------------------
-session_store = {}
 
 class JsonRequest(object):
     """ JSON-RPC2 over HTTP POST using non standard POST encoding.
@@ -84,8 +83,8 @@ class JsonRequest(object):
 
     def parse(self, request):
         self.params = request.get("params",{})
-        self.session_id = self.params.pop("session_id", None) or "random.random"
-        self.session = session_store.setdefault(self.session_id, OpenERPSession())
+        self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex
+        self.session = cherrypy.session.setdefault(self.session_id, OpenERPSession())
         self.context = self.params.pop('context', None)
         return self.params
 
@@ -148,7 +147,11 @@ class JsonRequest(object):
 
         print "<--",  response
         print
-        return simplejson.dumps(response)
+
+        content = simplejson.dumps(response)
+        cherrypy.response.headers['Content-Type'] = 'application/json'
+        cherrypy.response.headers['Content-Length'] = len(content)
+        return content
 
 def jsonrequest(f):
     @cherrypy.expose
@@ -245,20 +248,31 @@ class Root(object):
                         return m(**kw)
 
         else:
-            return '<a href="/base/static/openerp/base.html">/base/static/openerp/base.html</a>'
+            raise cherrypy.HTTPRedirect('/base/static/openerp/base.html', 301)
     default.exposed = True
 
 def main(argv):
-    # optparse
+    # Parse config
+    op = optparse.OptionParser()
+    op.add_option("-p", "--port", dest="socket_port", help="listening port", metavar="NUMBER", default=8002)
+    op.add_option("-s", "--session-path", dest="storage_path", help="directory used for session storage", metavar="DIR", default=os.path.join(tempfile.gettempdir(),"cpsessions"))
+    (o, args) = op.parse_args(argv[1:])
 
+    # Prepare cherrypy config from options
+    if not os.path.exists(o.storage_path):
+        os.mkdir(o.storage_path, 0700)
     config = {
-        'server.socket_port': 8002,
-        #'server.socket_host': '64.72.221.48',
+        'server.socket_port': int(o.socket_port),
+        'server.socket_host': '0.0.0.0',
         #'server.thread_pool' = 10,
         'tools.sessions.on': True,
+        'tools.sessions.storage_type': 'file',
+        'tools.sessions.storage_path': o.storage_path,
+        'tools.sessions.timeout': 60
     }
-    cherrypy.tree.mount(Root())
 
+    # Setup and run cherrypy
+    cherrypy.tree.mount(Root())
     cherrypy.config.update(config)
     cherrypy.server.subscribe()
     cherrypy.engine.start()