diff --git a/doc/config.html b/doc/config.html
index 5384ef8e..65adefa3 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -198,6 +198,12 @@ be allowed as well (maybe with only a subset of the available logbooks). In that
 this options can be used, to show a list of logbooks with guest access.
 <p>
 
+<LI><b><code>Protect Selection page = 0 | 1</code></b>
+<br>
+Normally, one can see the logbook selection page without having to log in. If one
+wants to require a login for the selection page, this switch can be set to 
+<b><code>1</code></b>. Default is <b><code>0</code></b>.<p>
+
 <LI><b><code>SMTP host = &lt;host.domain&gt;</code></b>
 <br>
 This defines the SMTP host needed to send automatic email notifications. The host
diff --git a/src/elogd.c b/src/elogd.c
index b713b455..655df5a2 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
   
    $Log$
+   Revision 1.318  2004/04/08 14:21:14  midas
+   Implemented 'protect selection page'
+
    Revision 1.317  2004/04/06 21:19:59  midas
    Fixed problem with multiple quick filters on attributes without option lists
 
@@ -15713,7 +15716,9 @@ void show_selection_page()
       return;
 
    /* if selection page protected, check password */
-   if (getcfg("global", "password file", str))
+   if (getcfg("global", "password file", str) &&
+       getcfg("global", "protect selection page", str) &&
+       atoi(str) == 1)
       if (!check_user_password(NULL, getparam("unm"), getparam("upwd"), ""))
          return;