Index: /main/waeup.kofa/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kofa/trunk/CHANGES.txt	(revision 11438)
+++ /main/waeup.kofa/trunk/CHANGES.txt	(revision 11439)
@@ -4,4 +4,10 @@
 1.0.1dev (unreleased)
 =====================
+
+* After login and logout regular users (officers) are redirected
+  to the portal's index page not to the portal's root. The
+  root URL can now be rewritten be Nginx or Apache so that the user
+  is being redirected to the university website
+  when entering the root URL directly or clicking the acronym.
 
 * Show tooltip alert and warning window before updating plugins.
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 11438)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 11439)
@@ -292,7 +292,5 @@
                     return
                 if not self.camefrom:
-                    # User might have entered the URL directly. Let's beam
-                    # him back to our context.
-                    self.redirect(self.url(self.context))
+                    self.redirect(self.application_url() + '/index')
                     return
                 self.redirect(self.camefrom)
@@ -343,5 +341,6 @@
             ILogout(auth).logout(self.request)
             self.flash(_("You have been logged out. Thanks for using WAeUP Kofa!"))
-        self.redirect(self.application_url())
+        self.redirect(self.application_url() + '/index')
+        return
 
 
