diff --git a/config/config.go b/config/config.go
index d864d2c..d885402 100644
--- a/config/config.go
+++ b/config/config.go
@@ -119,11 +119,11 @@ func loadAccountConfig(path string) ([]AccountConfig, error) {
 		for key, val := range sec.KeysHash() {
 			if key == "folders" {
 				account.Folders = strings.Split(val, ",")
-			} else if key == "source_cred_cmd" {
+			} else if key == "source-cred-cmd" {
 				account.SourceCredCmd = val
 			} else if key == "outgoing" {
 				account.Outgoing = val
-			} else if key == "outgoing_cred_cmd" {
+			} else if key == "outgoing-cred-cmd" {
 				account.OutgoingCredCmd = val
 			} else if key == "from" {
 				account.From = val
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index d8b1fc7..62e1461 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -144,11 +144,11 @@ Note that many of these configuration options are written for you, such as
 
 	- *aerc-smtp*(5)
 
-*outgoing_cred_cmd*
+*outgoing-cred-cmd*
 	Specifies an optional command that is run to get the outgoing account's
-	password. See each protocol's man page for more details:
+	password. See each protocol's man page for more details.
 
-	- *aerc-smtp*(5)
+	Default: none
 
 *source*
 	Specifies the source for reading incoming emails on this account. This key
@@ -160,11 +160,9 @@ Note that many of these configuration options are written for you, such as
 
 	Default: none
 
-*source_cred_cmd*
+*source-cred-cmd*
 	Specifies an optional command that is run to get the source account's
-	password. See each protocol's man page for more details:
-
-	- *aerc-imap*(5)
+	password. See each protocol's man page for more details.
 
 
 # BINDS.CONF