Comment 7 for bug 687660

Hey Didier. I'm assigning the bug to you first since it seems to depend a lot on how the session is managed first. Re-assign once it's clearer what kind of code change is required (if needed).