diff --git a/src/gvmd.c b/src/gvmd.c
index 09be3186d..5b3262c59 100644
--- a/src/gvmd.c
+++ b/src/gvmd.c
@@ -2034,6 +2034,10 @@ gvmd (int argc, char** argv, char *env[])
           &priorities,
           "Sets the GnuTLS priorities for the Manager socket.",
           "<priorities-string>" },
+        { "hashcount", '\0', 0, G_OPTION_ARG_CALLBACK,
+           parse_authentication_goption_arg,
+          "Use <hashcount> to enhance the computational cost of creating a password hash.",
+          "<hashcount>" },
         { "inheritor", '\0', 0, G_OPTION_ARG_STRING,
           &inheritor,
           "Have <username> inherit from deleted user.",
@@ -2114,6 +2118,10 @@ gvmd (int argc, char** argv, char *env[])
           &password,
           "Password, for --create-user.",
           "<password>" },
+        { "pepper", '\0', 0, G_OPTION_ARG_CALLBACK,
+           parse_authentication_goption_arg,
+          "Use <pepper> to statically enhance salt of password hashes (maximal 4 character).",
+          "<pepper>" },
         { "port", 'p', 0, G_OPTION_ARG_STRING,
           &manager_port_string,
           "Use port number <number>.",
@@ -2227,14 +2235,6 @@ gvmd (int argc, char** argv, char *env[])
           &verify_scanner,
           "Verify scanner <scanner-uuid> and exit.",
           "<scanner-uuid>" },
-        { "pepper", '\0', 0, G_OPTION_ARG_CALLBACK,
-           parse_authentication_goption_arg,
-          "Use <pepper> to statically enhance salt of password hashes (maximal 4 character).",
-          "<pepper>" },
-        { "hashcount", '\0', 0, G_OPTION_ARG_CALLBACK,
-           parse_authentication_goption_arg,
-          "Use <hashcount> to enhance the computational cost of creating a password hash.",
-          "<hashcount>" },
         { "version", '\0', 0, G_OPTION_ARG_NONE,
           &print_version,
           "Print version and exit.",