Merge branch 'master' into patched-master

1 files changed, 9 insertions, 0 deletions

diff --git a/root_commands.c b/root_commands.c
index fde84527..414ab640 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -478,6 +478,13 @@ static void cmd_account(irc_t *irc, char **cmd)
 				*a->pass = '\0';
 				irc_rootmsg(irc, "No need to enter a password for this "
 				            "account since it's using OAuth");
+			} else if (prpl->options & PRPL_OPT_NO_PASSWORD) {
+				*a->pass = '\0';
+			} else if (prpl->options & PRPL_OPT_PASSWORD_OPTIONAL) {
+				*a->pass = '\0';
+				irc_rootmsg(irc, "Passwords are optional for this account. "
+				            "If you wish to enter the password with /OPER, do "
+				            "account %s set -del password", a->tag);
 			} else {
 				irc_rootmsg(irc, "You can now use the /OPER command to "
 				            "enter the password");
@@ -487,6 +494,8 @@ static void cmd_account(irc_t *irc, char **cmd)
 					            "set oauth on", a->tag);
 				}
 			}
+		} else if (prpl->options & PRPL_OPT_NO_PASSWORD) {
+			irc_rootmsg(irc, "Note: this account doesn't use password for login");
 		}
 
 		return;