diff --git a/doc/adminguide.html b/doc/adminguide.html
index 79e4a69e..b917f1fa 100755
--- a/doc/adminguide.html
+++ b/doc/adminguide.html
@@ -302,16 +302,6 @@ option in <code>elogd.cfg</code> to <code><b>port=80</code></B> and restarting e
 <li><code>-f &lt;file&gt;</code>&nbsp;specify PID file where elogd process ID is written when server is started
 <li><code>-x&nbsp; </code>enables execution of shell commands</li>
 
-</ul>
-<p>
-It may also be used to generate passwords :
-<ul><code><pre>elogd [-r pwd] [-w pwd] [-a pwd] [-l logbook]</code></PRE></ul>
-<p>with :
-<ul>
-<li><code>-r &lt;pwd&gt;</code>&nbsp;create/overwrite read password in config file
-<li><code>-w &lt;pwd&gt;</code>&nbsp;create/overwrite write password in config file
-<li><code>-a &lt;pwd&gt;</code>&nbsp;create/overwrite administrative password in config file
-<li><code>-l &lt;logbook&gt;</code>&nbsp;specify logbook for -r and -w commands</li>
 </ul>
 
 <p> The appearance, functionality and behaviour of the various logbooks on an <b>ELOG</b> server are
diff --git a/man/elogd.8 b/man/elogd.8
index 969cf35b..4120ddda 100755
--- a/man/elogd.8
+++ b/man/elogd.8
@@ -19,11 +19,11 @@
 elogd \- web server program for Electronic Logbook ELOG
 .SH SYNOPSIS
 .sp
-\fBelog\fR [ \fB-a \fIpassword\fB\fR ] [ \fB-C \fIurl\fB\fR ] [ \fB-c \fIfile\fB\fR ]
+\fBelog\fR [ \fB-C \fIurl\fB\fR ] [ \fB-c \fIfile\fB\fR ]
 [ \fB-D\fR ] [ \fB-d \fIdirectory\fB\fR ] [ \fB-f \fIfile\fB\fR ] [ \fB-k\fR ]
 [ \fB-l \fIlogbook\fB\fR ] [ \fB-M\fR ] [ \fB-m\fR ] [ \fB-n \fIhostname\fB\fR ] 
-[ \fB-p \fIport\fB\fR ] [ \fB-r \fIpassword\fB\fR ] [ \fB-S\fR ] 
-[ \fB-s \fIdirectory\fB\fR ] [ \fB-v\fR ] [ \fB-w \fIpassword\fB\fR ] [ \fB-x\fR ]
+[ \fB-p \fIport\fB\fR ] [ \fB-S\fR ] 
+[ \fB-s \fIdirectory\fB\fR ] [ \fB-v\fR ] [ \fB-x\fR ]
 
 .SH DESCRIPTION
 .PP
@@ -41,9 +41,6 @@ system.
 .SH OPTIONS
 \fBelogd\fP accepts the following options:
 .TP
-.BI -a " password"
-create/overwrite admin password in config file
-.TP
 .BI -C " url"
 clone remote elogd configuration
 .TP
@@ -81,9 +78,6 @@ port where
 .B elogd
 will run
 .TP
-.BI -r " password"
-create/overwrite read password in config file
-.TP
 .BR -S
 be silent
 .TP
@@ -93,9 +87,6 @@ specify resource directory (eg. themes, icons)
 .BR -v
 debugging output
 .TP
-.BI -w " password"
-create/overwrite write password in config file
-.TP
 .BR -x
 enable execution of shell commands (unless compiled with this feature)
 .SH SEE ALSO
@@ -118,12 +109,9 @@ options in configuration file. The configuration and stylesheet files should
 be readable by that user.
 .PP
 Passwords are transferred over the network in plain text and therefore, are not
-secure. Although the
+secure. So if passwords are used
 .B elogd
-program does not support secure connections over SSL directly, an SSL
-encryption wrapper like
-.I stunnel
-might be used for this purpose.
+should be started with the SSL option in the configuration file for secure connections.
 .SH AUTHOR
 Written by Stefan Ritt <stefan.ritt@psi.ch>.
 .PP
diff --git a/src/elogd.c b/src/elogd.c
index be2d0f33..1db4633f 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -29676,9 +29676,9 @@ int main(int argc, char *argv[])
 #endif
          else {
           usage:printf("%s\n", ELOGID);
-            printf("usage: elogd [-a <pwd>] [-C <url>] [-c <file>] [-D] [-d <dir>] ");
+            printf("usage: elogd [-C <url>] [-c <file>] [-D] [-d <dir>] ");
             printf("[-f <file>] [-h] [-k] [-l <logbook>] [-M] [-m] [-n <hostname>] ");
-            printf("[-p <port>] [-r <pwd>] [-S] [-s <dir>] [-t <pwd>] [-v] [-w <pwd>] [-x]\n\n");
+            printf("[-p <port>] [-S] [-s <dir>] [-t <pwd>] [-v] [-x]\n\n");
             printf("       -C <url> clone remote elogd configuration\n");
             printf("       -c <file> specify configuration file\n");
             printf("       -M synchronize with removing deleted entries\n");