--- __init__old.py	2007-01-14 15:34:48.000000000 +0100
+++ __init__.py	2007-01-18 18:03:10.000000000 +0100
@@ -1088,7 +1088,14 @@
                 page = wikiutil.getSysPage(self, 'UserPreferences')
                 page.send_page(self, msg=msg)
 
-            # 2. Or jump to page where user left off
+            # 2. If show_welcome for new users is activated in wikiconfig.py
+            # and user hasn't turned of welcome page as starting page, show WelcomeUser page
+            elif not pagename and self.cfg.show_welcome and self.user.show_welcome:
+                welcome = wikiutil.getSysPage(self, 'WelcomeUser').url(self, escape=0, relative=False)
+                self.http_redirect(welcome)
+                return self.finish()
+                
+            # 3. Or jump to page where user left off
             elif not pagename and self.user.remember_last_visit:
                 pagetrail = self.user.getTrail()
                 if pagetrail:
@@ -1104,7 +1111,7 @@
                 self.http_redirect(url)
                 return self.finish()
 
-            # 3. Or handle action
+            # 4. Or handle action
             else:
                 # pagename could be empty after normalization e.g. '///' -> ''
                 # Use localized FrontPage if pagename is empty