Index: /main/waeup.kofa/trunk/src/waeup/kofa/language.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/language.py	(revision 7831)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/language.py	(revision 7832)
@@ -16,8 +16,10 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-
+"""Handle language as requested by users.
+"""
 import grokcore.component
 from zope.component import getUtility
 from zope.publisher.interfaces.browser import IBrowserRequest
+from zope.session.interfaces import ISession
 from zope.i18n.interfaces import IUserPreferredLanguages
 from waeup.kofa.configuration import ConfigurationContainer
@@ -30,11 +32,12 @@
 
     def getPreferredLanguages(self):
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-
         # This an adapter for the request, so self.context is the request.
         request = self.context
 
         # Extract the preferred language from a cookie:
-        lang = request.cookies.get('kofa.language', portal_language)
+        lang = request.cookies.get('kofa.language', None)
+        if lang is None:
+            lang = getUtility(IKofaUtils).PORTAL_LANGUAGE
+            request.response.setCookie('kofa.language', lang, path='/')
 
         # According to IUserPreferredLanguages, we must return a list.
