diff --git a/cmd/config.go b/cmd/config.go
index 650b46e6..a309add6 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -35,13 +35,12 @@ func addConfigFlags(flags *pflag.FlagSet) {
 	flags.Bool("create-user-dir", false, "generate user's home directory automatically")
 	flags.Uint("minimum-password-length", settings.DefaultMinimumPasswordLength, "minimum password length for new users")
 	flags.String("shell", "", "shell command to which other commands should be appended")
+	flags.String("logout-page", "", "url of custom logout page")
 
 	flags.String("auth.method", string(auth.MethodJSONAuth), "authentication type")
 	flags.String("auth.header", "", "HTTP header for auth.method=proxy")
 	flags.String("auth.command", "", "command for auth.method=hook")
 
-	flags.String("logoutpage", "", "custom logout page")
-
 	flags.String("recaptcha.host", "https://www.google.com", "use another host for ReCAPTCHA. recaptcha.net might be useful in China")
 	flags.String("recaptcha.key", "", "ReCaptcha site key")
 	flags.String("recaptcha.secret", "", "ReCaptcha secret")
diff --git a/cmd/config_set.go b/cmd/config_set.go
index 35072351..5a3ec708 100644
--- a/cmd/config_set.go
+++ b/cmd/config_set.go
@@ -56,8 +56,8 @@ you want to change. Other options will remain unchanged.`,
 				set.Signup, err = getBool(flags, flag.Name)
 			case "auth.method":
 				hasAuth = true
-			case "logoutpage":
-				set.LogoutPage = mustGetString(flags, flag.Name)
+			case "logout-page":
+				set.LogoutPage, err = getString(flags, flag.Name)
 			case "shell":
 				var shell string
 				shell, err = getString(flags, flag.Name)