diff --git a/libbeat/cmd/keystore.go b/libbeat/cmd/keystore.go
index b482c1260ab..706efd5b6ca 100644
--- a/libbeat/cmd/keystore.go
+++ b/libbeat/cmd/keystore.go
@@ -104,7 +104,7 @@ func genAddKeystoreCmd(settings instance.Settings) *cobra.Command {
 func genRemoveKeystoreCmd(settings instance.Settings) *cobra.Command {
 	return &cobra.Command{
 		Use:   "remove",
-		Short: "remove secret",
+		Short: "Remove secret",
 		Run: cli.RunWith(func(cmd *cobra.Command, args []string) error {
 			store, err := getKeystore(settings)
 			if err != nil {
@@ -136,7 +136,7 @@ func createKeystore(settings instance.Settings, force bool) error {
 	}
 
 	if store.IsPersisted() == true && force == false {
-		response := terminal.PromptYesNo("A keystore already exists, Overwrite?", true)
+		response := terminal.PromptYesNo("A keystore already exists, Overwrite?", false)
 		if response == true {
 			err := store.Create(true)
 			if err != nil {
diff --git a/libbeat/common/config.go b/libbeat/common/config.go
index 4a9cb851466..b1d6eadd8b9 100644
--- a/libbeat/common/config.go
+++ b/libbeat/common/config.go
@@ -432,7 +432,7 @@ func OwnerHasExclusiveWritePerms(name string) error {
 	perm := info.Mode().Perm()
 
 	if fileUID != 0 && euid != fileUID {
-		return fmt.Errorf(`config file ("%v") must be owned by the beat user `+
+		return fmt.Errorf(`config file ("%v") must be owned by the user identifier `+
 			`(uid=%v) or root`, name, euid)
 	}
 
diff --git a/libbeat/keystore/file_keystore.go b/libbeat/keystore/file_keystore.go
index 3f530a58120..fb1aa15c590 100644
--- a/libbeat/keystore/file_keystore.go
+++ b/libbeat/keystore/file_keystore.go
@@ -389,7 +389,7 @@ func (k *FileKeystore) checkPermissions(f string) error {
 	perm := info.Mode().Perm()
 
 	if fileUID != 0 && euid != fileUID {
-		return fmt.Errorf(`config file ("%v") must be owned by the beat user `+
+		return fmt.Errorf(`config file ("%v") must be owned by the user identifier `+
 			`(uid=%v) or root`, f, euid)
 	}