--- a/doc/web/source/howto/manage_accounts.rst	Sat Feb 15 21:48:40 2014 +0000
+++ b/doc/web/source/howto/manage_accounts.rst	Sat Feb 15 23:38:27 2014 +0000
@@ -148,9 +148,20 @@
 
 userpassword
 ------------
+.. program:: vmm userpassword
+
 Syntax:
- | **vmm userpassword** *address* [**-p** *password*]
- | **vmm up** *address* [**-p** *password*]
+ | **vmm userpassword** *address* [**-p** *password*] [**-s** *scheme*]
+ | **vmm up** *address* [**-p** *password*] [**-s** *scheme*]
+
+.. option:: -p password
+
+ The user's new password.
+
+.. option:: -s scheme
+
+ When a *scheme* was specified, it overrides the *misc.password_scheme*
+ setting, configured in the :file:`vmm.cfg` file.
 
 The password of an account can be updated with this subcommand.
 

--- a/man/man1/vmm.1	Sat Feb 15 21:48:40 2014 +0000
+++ b/man/man1/vmm.1	Sat Feb 15 23:38:27 2014 +0000
@@ -1,4 +1,4 @@
-.TH "VMM" "1" "2013-01-23" "vmm 0.7" "vmm"
+.TH "VMM" "1" "2014-02-15" "vmm 0.7" "vmm"
 .SH NAME
 vmm \- command line tool to manage email domains/accounts/aliases
 .\" -----------------------------------------------------------------------
@@ -838,6 +838,23 @@
 .BI "vmm userpassword" " address"
 .RB [ \-p
 .IR password ]
+.RB [ \-s
+.IR scheme ]
+.PP
+.TP
+.BI "\-p " password
+The user\(aqs new password.
+.\" ------------------------------------
+.TP
+.BI "\-s " scheme
+When a
+.I scheme
+was specified, it overrides the
+.I misc.password_scheme
+setting, configured in the
+.I vmm.cfg
+file.
+.\" ------------------------------------
 .PP
 The password of an account can be updated with this subcommand.
 .PP