diff --git a/src/command/command.c b/src/command/command.c
index 9ff66c75..b2a4c438 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1399,14 +1399,15 @@ static struct cmd_t command_defs[] =
             "/account set <account> jid <jid>",
             "/account set <account> server <server>",
             "/account set <account> port <port>",
-            "/account set <account> status <status>",
-            "/account set <account> online|chat|away|xa|dnd <priority>",
+            "/account set <account> status <presence>",
+            "/account set <account> status last",
+            "/account set <account> <presence> <priority>",
             "/account set <account> resource <resource>",
             "/account set <account> password <password>",
             "/account set <account> eval_password <command>",
             "/account set <account> muc <service>",
             "/account set <account> nick <nick>",
-            "/account set <account> otr manual|opportunistic|always",
+            "/account set <account> otr <policy>",
             "/account set <account> pgpkeyid <pgpkeyid>",
             "/account clear <account> password",
             "/account clear <account> eval_password",
@@ -1418,33 +1419,34 @@ static struct cmd_t command_defs[] =
             "Commands for creating and managing accounts. "
             "Calling with no arguments will display information for the current account.")
         CMD_ARGS(
-            { "list",                                             "List all accounts." },
-            { "show <account>",                                   "Show details for the specified account." },
-            { "enable <account>",                                 "Enable the account, it will be used for autocompletion." },
-            { "disable <account>",                                "Disable the account." },
-            { "default set <account>",                            "Set the default account, used when no argument passed to the /connect command." },
-            { "default off",                                      "Clear the default account setting." },
-            { "add <account>",                                    "Create a new account." },
-            { "remove <account>",                                 "Remove an account." },
-            { "rename <account> <newaccount>",                    "Rename 'account' to 'newaccount'." },
-            { "set <account> jid <jid>",                          "Set the Jabber ID for the account, account name will be used if not set." },
-            { "set <account> server <server>",                    "The chat server, if different to the domainpart of the JID." },
-            { "set <account> port <port>",                        "The port used for connecting if not the default (5222, or 5223 for SSL)." },
-            { "set <account> status <status>",                    "The presence status to use on login, use 'last' to use your last status before logging out." },
-            { "set <account> online|chat|away|xa|dnd <priority>", "Set the priority (-128..127) to use for the specified presence." },
-            { "set <account> resource <resource>",                "The resource to be used for this account." },
-            { "set <account> password <password>",                "Password for the account, note this is currently stored in plaintext if set." },
-            { "set <account> eval_password <command>",            "Shell command evaluated to retrieve password for the account. Can be used to retrieve password from keyring." },
-            { "set <account> muc <service>",                      "The default MUC chat service to use, defaults to 'conference.<domainpart>' where the domain part is from the account JID." },
-            { "set <account> nick <nick>",                        "The default nickname to use when joining chat rooms." },
-            { "set <account> otr manual|opportunistic|always",    "Override global OTR policy for this account, see /otr." },
-            { "set <account> pgpkeyid <pgpkeyid>",                "Set the ID of the PGP key for this account, see /pgp." },
-            { "clear <account> server",                           "Remove the server setting for this account." },
-            { "clear <account> port",                             "Remove the port setting for this account." },
-            { "clear <account> password",                         "Remove the password setting for this account." },
-            { "clear <account> eval_password",                    "Remove the eval_password setting for this account." },
-            { "clear <account> otr",                              "Remove the OTR policy setting for this account." },
-            { "clear <account> pgpkeyid",                         "Remove pgpkeyid associated with this account." })
+            { "list",                                   "List all accounts." },
+            { "enable <account>",                       "Enable the account, it will be used for autocompletion." },
+            { "show <account>",                         "Show details for the specified account." },
+            { "disable <account>",                      "Disable the account." },
+            { "default set <account>",                  "Set the default account, used when no argument passed to the /connect command." },
+            { "default off",                            "Clear the default account setting." },
+            { "add <account>",                          "Create a new account." },
+            { "remove <account>",                       "Remove an account." },
+            { "rename <account> <newaccount>",          "Rename 'account' to 'newaccount'." },
+            { "set <account> jid <jid>",                "Set the Jabber ID for the account, account name will be used if not set." },
+            { "set <account> server <server>",          "The chat server, if different to the domainpart of the JID." },
+            { "set <account> port <port>",              "The port used for connecting if not the default (5222, or 5223 for SSL)." },
+            { "set <account> status <presence>",        "The presence status to use on login." },
+            { "set <account> status last",              "Use your last status before logging out, when logging in." },
+            { "set <account> <presence> <priority>",    "Set the priority (-128..127) to use for the specified presence." },
+            { "set <account> resource <resource>",      "The resource to be used for this account." },
+            { "set <account> password <password>",      "Password for the account, note this is currently stored in plaintext if set." },
+            { "set <account> eval_password <command>",  "Shell command evaluated to retrieve password for the account. Can be used to retrieve password from keyring." },
+            { "set <account> muc <service>",            "The default MUC chat service to use, defaults to 'conference.<domainpart>' where the domain part is from the account JID." },
+            { "set <account> nick <nick>",              "The default nickname to use when joining chat rooms." },
+            { "set <account> otr <policy>",             "Override global OTR policy for this account, see /otr." },
+            { "set <account> pgpkeyid <pgpkeyid>",      "Set the ID of the PGP key for this account, see /pgp." },
+            { "clear <account> server",                 "Remove the server setting for this account." },
+            { "clear <account> port",                   "Remove the port setting for this account." },
+            { "clear <account> password",               "Remove the password setting for this account." },
+            { "clear <account> eval_password",          "Remove the eval_password setting for this account." },
+            { "clear <account> otr",                    "Remove the OTR policy setting for this account." },
+            { "clear <account> pgpkeyid",               "Remove pgpkeyid associated with this account." })
         CMD_EXAMPLES(
             "/account add me",
             "/account set me jid me@chatty",