diff --git a/ckanext/ozwillo_pyoidc/plugin.py b/ckanext/ozwillo_pyoidc/plugin.py
index 1a2338b..bfc2d54 100755
--- a/ckanext/ozwillo_pyoidc/plugin.py
+++ b/ckanext/ozwillo_pyoidc/plugin.py
@@ -86,7 +86,21 @@ class OzwilloPyoidcPlugin(plugins.SingletonPlugin):
 
     def logout(self):
         session['user'] = None
-        session.save()
+        try:
+            g = model.Group.get(session['organization_id'])
+        except:
+            toolkit.redirect_to('/')
+        else:
+            session['organization_id'] = None
+            session.save()
+
+            org_url = toolkit.url_for(host=request.host,
+                                      controller='organization',
+                                      action='read',
+                                      id=g.name,
+                                      qualified=True)
+
+            toolkit.redirect_to(org_url)
 
     def update_config(self, config_):
         toolkit.add_template_directory(config_, 'templates')