diff --git a/modules/webaccess/lib/access_control_config.py b/modules/webaccess/lib/access_control_config.py
index d5363b495..ad08818ed 100644
--- a/modules/webaccess/lib/access_control_config.py
+++ b/modules/webaccess/lib/access_control_config.py
@@ -1,147 +1,144 @@
 ## $Id$
 ## CDSware Access Control Config in mod_python.
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## The CDSware is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 #include "config.wml"
 #include "configbis.wml"
 supportemail = "<SUPPORTEMAIL>"
 adminemail = "<ADMINEMAIL>"
 
 """CDSware Access Control Config. """
 
 <protect> ## okay, rest of the Python code goes below #######
 
 __version__ = "$Id$"
 
 from config import *
 
 # VALUES TO BE EXPORTED
 # CURRENTLY USED BY THE FILES access_control_engine.py access_control_admin.py webaccessadmin_lib.py
 
 # name of the role giving superadmin rights
 SUPERADMINROLE      = 'superadmin'
 # name of the webaccess webadmin role
 WEBACCESSADMINROLE  = 'webaccessadmin'
 # name of the action allowing roles to access the web administrator interface
 WEBACCESSACTION     = 'cfgwebaccess'
 # name of the action allowing roles to delegate the rights to other roles
 # ex: libraryadmin to delegate libraryworker
 DELEGATEADDUSERROLE = 'accdelegaterole'
 # max number of users to display in the drop down selects
 MAXSELECTUSERS = 25
 # max number of users to display in a page (mainly for user area)
 MAXPAGEUSERS = 25
 # site open or closed for all access 
 #0 = open
 #1 = closed
 CFG_ACCESS_CONTROL_SITE_TEMPORARILY_CLOSED = 0
 # access policy for guests. 
 #0 = Allow guests to search, 
 #1 = Guests cannot search (all users must login)
 CFG_ACCESS_CONTROL_LEVEL_GUESTS = 0
 # access policy for accounts. 
 #0 = Users can register, automatically acticate accounts
 #1 = Users can register, but admin must activate the accounts
 #2 = Users cannot register or update email address, only admin can register accounts. 
 CFG_ACCESS_CONTROL_LEVEL_ACCOUNTS = 0
 # limit email addresses available to use when register a new account (example: cern.ch):
 CFG_ACCESS_CONTROL_LIMIT_TO_DOMAIN = ""
 # send an email when a new account is created by an user
 CFG_ACCESS_CONTROL_NOTIFY_ADMIN_ABOUT_NEW_ACCOUNTS = 0
 # send it to this email-address
 CFG_ACCESS_CONTROL_SEND_TO_EMAIL = adminemail
 # send an email to the user notifying when the account is created
 CFG_ACCESS_CONTROL_NOTIFY_USER_ABOUT_NEW_ACCOUNT = 0
 # send an email to the user notifying when the account is activated
 CFG_ACCESS_CONTROL_NOTIFY_USER_ABOUT_ACTIVATION = 0
 # send an email to the user notifying when the account is deleted/rejected
 CFG_ACCESS_CONTROL_NOTIFY_USER_ABOUT_DELETION = 0
 
 # default data for the add_default_settings function
 # roles
 #           name          description
 def_roles = ((SUPERADMINROLE, 'superuser with all rights'),
              ('photoadmin',   'Photo collection administrator'),
              (WEBACCESSADMINROLE,     'WebAccess administrator'))
 # users
 # list of e-mail addresses
 def_users = []
 # actions
 #            name                  desc     allowedkeywords   optional
 def_actions = (
                ('cfgwebsearch',         'configure WebSearch',       '',              'no'),
                ('cfgbibformat',         'configure BibFormat',       '',              'no'),
                ('cfgwebsubmit',         'configure WebSubmit',       '',              'no'),
                ('runbibindex',          'run BibIndex',       '',              'no'),
                ('runbibupload',         'run BibUpload',       '',              'no'),
                ('runwebcoll',           'run webcoll',       'collection',    'yes'),
                ('runbibformat',         'run BibFormat',       'format',        'yes'),
                (WEBACCESSACTION,        'configure WebAccess',       '',              'no'),
                (DELEGATEADDUSERROLE,    'delegate subroles inside WebAccess',       'role',          'no'),
                ('runbibtaskex',         'run BibTaskEx example',       '',              'no'),
                ('referee',                  'referee document type doctype/category categ', 'doctype,categ',    'yes'),
                ('submit',                   'use webSubmit',    'doctype,act',  'yes'),
                ('runbibrank',         'run BibRank',       '',              'no'),
                ('cfgbibrank',         'configure BibRank',       '',              'no'),
               )
 # authorizations
 #          role              action          arglistid  optional   arguments
 def_auths = (
              (SUPERADMINROLE,    'cfgwebsearch',         -1,      0,       {}),
              (SUPERADMINROLE,    'cfgbibformat',         -1,      0,       {}),
              (SUPERADMINROLE,    'cfgwebsubmit',         -1,      0,       {}),
              (SUPERADMINROLE,    'runbibindex',          -1,      0,       {}),
              (SUPERADMINROLE,    'runbibupload',         -1,      0,       {}),
              (SUPERADMINROLE,    'runbibformat',         -1,      1,       {}),
              (SUPERADMINROLE,    WEBACCESSACTION,        -1,      0,       {}), 
              ('photoadmin',      'runwebcoll',           -1,      0,       {'collection': 'Pictures'}),
              (WEBACCESSADMINROLE,WEBACCESSACTION,        -1,      0,       {}),
              (SUPERADMINROLE,    'runtaskex',            -1,      0,       {}),
              (SUPERADMINROLE,    'referee',         -1,      1,       {}),
              (SUPERADMINROLE,    'submit',         -1,      1,       {}),
              (SUPERADMINROLE,    'runbibrank',           -1,      0,       {}),
              (SUPERADMINROLE,    'cfgbibrank',           -1,      0,       {}),
             )
 cfg_webaccess_msgs = {
                                 0: 'Try to <a href="%s/youraccount.py/login?referer=%s/admin/%s/">login</a> with another account.' % (weburl, weburl, "%s"),
                                 1: '<br>If you think this is not correct, please contact: <a href="mailto:%s">%s</a>' % (supportemail, supportemail),
                                 2: '<br>Any questions should be sent to: <a href="mailto:%s">%s</a>' % (supportemail, supportemail),
 				3: 'Guest users are not allowed, please <a href="%s/youraccount.py/login">login</a>.' % weburl,
 				4: 'The site is temporarily closed for maintenance.  Please come back soon.',
  				5: 'Authorization failure',
                                 6: '%s temporarily closed' % cdsname
 
 		} 
 
 
 cfg_webaccess_warning_msgs = {
            			0: 'Authorization granted',
            			1: 'Error(1): You are not authorized to perform this action.',
                                 2: 'Error(2): You are not authorized to perform any action.',
            			3: 'Error(3): The action %s does not exist.',
                                 4: 'Error(4): Unexpected error occurred.',
                                 5: 'Error(5): Missing mandatory keyword argument(s) for this action.',
                                 6: 'Error(6): Guest accounts are not authorized to perform this action.',
                                 7: 'Error(7): Not enough arguments, user ID and action name required.',
                                 8: 'Error(8): Incorrect keyword argument(s) for this action.',
                                 9: """Error(9): Account '%s' is not yet activated."""
 		} 
-</protect>
-
-
-"""Guest users are not allowed, please <a href="%s/youraccount.py/login">login</a>.""" % weburl
+</protect>
\ No newline at end of file
diff --git a/modules/webaccess/lib/access_control_config.py.wml b/modules/webaccess/lib/access_control_config.py.wml
index d5363b495..ad08818ed 100644
--- a/modules/webaccess/lib/access_control_config.py.wml
+++ b/modules/webaccess/lib/access_control_config.py.wml
@@ -1,147 +1,144 @@
 ## $Id$
 ## CDSware Access Control Config in mod_python.
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## The CDSware is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 #include "config.wml"
 #include "configbis.wml"
 supportemail = "<SUPPORTEMAIL>"
 adminemail = "<ADMINEMAIL>"
 
 """CDSware Access Control Config. """
 
 <protect> ## okay, rest of the Python code goes below #######
 
 __version__ = "$Id$"
 
 from config import *
 
 # VALUES TO BE EXPORTED
 # CURRENTLY USED BY THE FILES access_control_engine.py access_control_admin.py webaccessadmin_lib.py
 
 # name of the role giving superadmin rights
 SUPERADMINROLE      = 'superadmin'
 # name of the webaccess webadmin role
 WEBACCESSADMINROLE  = 'webaccessadmin'
 # name of the action allowing roles to access the web administrator interface
 WEBACCESSACTION     = 'cfgwebaccess'
 # name of the action allowing roles to delegate the rights to other roles
 # ex: libraryadmin to delegate libraryworker
 DELEGATEADDUSERROLE = 'accdelegaterole'
 # max number of users to display in the drop down selects
 MAXSELECTUSERS = 25
 # max number of users to display in a page (mainly for user area)
 MAXPAGEUSERS = 25
 # site open or closed for all access 
 #0 = open
 #1 = closed
 CFG_ACCESS_CONTROL_SITE_TEMPORARILY_CLOSED = 0
 # access policy for guests. 
 #0 = Allow guests to search, 
 #1 = Guests cannot search (all users must login)
 CFG_ACCESS_CONTROL_LEVEL_GUESTS = 0
 # access policy for accounts. 
 #0 = Users can register, automatically acticate accounts
 #1 = Users can register, but admin must activate the accounts
 #2 = Users cannot register or update email address, only admin can register accounts. 
 CFG_ACCESS_CONTROL_LEVEL_ACCOUNTS = 0
 # limit email addresses available to use when register a new account (example: cern.ch):
 CFG_ACCESS_CONTROL_LIMIT_TO_DOMAIN = ""
 # send an email when a new account is created by an user
 CFG_ACCESS_CONTROL_NOTIFY_ADMIN_ABOUT_NEW_ACCOUNTS = 0
 # send it to this email-address
 CFG_ACCESS_CONTROL_SEND_TO_EMAIL = adminemail
 # send an email to the user notifying when the account is created
 CFG_ACCESS_CONTROL_NOTIFY_USER_ABOUT_NEW_ACCOUNT = 0
 # send an email to the user notifying when the account is activated
 CFG_ACCESS_CONTROL_NOTIFY_USER_ABOUT_ACTIVATION = 0
 # send an email to the user notifying when the account is deleted/rejected
 CFG_ACCESS_CONTROL_NOTIFY_USER_ABOUT_DELETION = 0
 
 # default data for the add_default_settings function
 # roles
 #           name          description
 def_roles = ((SUPERADMINROLE, 'superuser with all rights'),
              ('photoadmin',   'Photo collection administrator'),
              (WEBACCESSADMINROLE,     'WebAccess administrator'))
 # users
 # list of e-mail addresses
 def_users = []
 # actions
 #            name                  desc     allowedkeywords   optional
 def_actions = (
                ('cfgwebsearch',         'configure WebSearch',       '',              'no'),
                ('cfgbibformat',         'configure BibFormat',       '',              'no'),
                ('cfgwebsubmit',         'configure WebSubmit',       '',              'no'),
                ('runbibindex',          'run BibIndex',       '',              'no'),
                ('runbibupload',         'run BibUpload',       '',              'no'),
                ('runwebcoll',           'run webcoll',       'collection',    'yes'),
                ('runbibformat',         'run BibFormat',       'format',        'yes'),
                (WEBACCESSACTION,        'configure WebAccess',       '',              'no'),
                (DELEGATEADDUSERROLE,    'delegate subroles inside WebAccess',       'role',          'no'),
                ('runbibtaskex',         'run BibTaskEx example',       '',              'no'),
                ('referee',                  'referee document type doctype/category categ', 'doctype,categ',    'yes'),
                ('submit',                   'use webSubmit',    'doctype,act',  'yes'),
                ('runbibrank',         'run BibRank',       '',              'no'),
                ('cfgbibrank',         'configure BibRank',       '',              'no'),
               )
 # authorizations
 #          role              action          arglistid  optional   arguments
 def_auths = (
              (SUPERADMINROLE,    'cfgwebsearch',         -1,      0,       {}),
              (SUPERADMINROLE,    'cfgbibformat',         -1,      0,       {}),
              (SUPERADMINROLE,    'cfgwebsubmit',         -1,      0,       {}),
              (SUPERADMINROLE,    'runbibindex',          -1,      0,       {}),
              (SUPERADMINROLE,    'runbibupload',         -1,      0,       {}),
              (SUPERADMINROLE,    'runbibformat',         -1,      1,       {}),
              (SUPERADMINROLE,    WEBACCESSACTION,        -1,      0,       {}), 
              ('photoadmin',      'runwebcoll',           -1,      0,       {'collection': 'Pictures'}),
              (WEBACCESSADMINROLE,WEBACCESSACTION,        -1,      0,       {}),
              (SUPERADMINROLE,    'runtaskex',            -1,      0,       {}),
              (SUPERADMINROLE,    'referee',         -1,      1,       {}),
              (SUPERADMINROLE,    'submit',         -1,      1,       {}),
              (SUPERADMINROLE,    'runbibrank',           -1,      0,       {}),
              (SUPERADMINROLE,    'cfgbibrank',           -1,      0,       {}),
             )
 cfg_webaccess_msgs = {
                                 0: 'Try to <a href="%s/youraccount.py/login?referer=%s/admin/%s/">login</a> with another account.' % (weburl, weburl, "%s"),
                                 1: '<br>If you think this is not correct, please contact: <a href="mailto:%s">%s</a>' % (supportemail, supportemail),
                                 2: '<br>Any questions should be sent to: <a href="mailto:%s">%s</a>' % (supportemail, supportemail),
 				3: 'Guest users are not allowed, please <a href="%s/youraccount.py/login">login</a>.' % weburl,
 				4: 'The site is temporarily closed for maintenance.  Please come back soon.',
  				5: 'Authorization failure',
                                 6: '%s temporarily closed' % cdsname
 
 		} 
 
 
 cfg_webaccess_warning_msgs = {
            			0: 'Authorization granted',
            			1: 'Error(1): You are not authorized to perform this action.',
                                 2: 'Error(2): You are not authorized to perform any action.',
            			3: 'Error(3): The action %s does not exist.',
                                 4: 'Error(4): Unexpected error occurred.',
                                 5: 'Error(5): Missing mandatory keyword argument(s) for this action.',
                                 6: 'Error(6): Guest accounts are not authorized to perform this action.',
                                 7: 'Error(7): Not enough arguments, user ID and action name required.',
                                 8: 'Error(8): Incorrect keyword argument(s) for this action.',
                                 9: """Error(9): Account '%s' is not yet activated."""
 		} 
-</protect>
-
-
-"""Guest users are not allowed, please <a href="%s/youraccount.py/login">login</a>.""" % weburl
+</protect>
\ No newline at end of file