diff --git a/command/server.go b/command/server.go
index 5f7986b27c..b952694249 100644
--- a/command/server.go
+++ b/command/server.go
@@ -314,7 +314,8 @@ func (c *ServerCommand) Run(args []string) int {
 	info["version"] = version.GetVersion().String()
 
 	// Server configuration output
-	padding := 18
+	padding := 24
+	sort.Strings(infoKeys)
 	c.Ui.Output("==> Vault server configuration:\n")
 	for _, k := range infoKeys {
 		c.Ui.Output(fmt.Sprintf(