diff --git a/cli/packages/cmd/vault.go b/cli/packages/cmd/vault.go
index 8bb677682..a2b03dbec 100644
--- a/cli/packages/cmd/vault.go
+++ b/cli/packages/cmd/vault.go
@@ -42,7 +42,7 @@ var vaultSetCmd = &cobra.Command{
 
 			err = util.WriteConfigFile(&configFile)
 			if err != nil {
-				log.Errorf("Unable to set vault to [%s] because an error occurred when saving the config file [err=%s]")
+				log.Errorf("Unable to set vault to [%s] because an error occurred when saving the config file [err=%s]", wantedVaultTypeName, err)
 				return
 			}
 
diff --git a/cli/packages/util/common.go b/cli/packages/util/common.go
index 37c881994..f3ee274b3 100644
--- a/cli/packages/util/common.go
+++ b/cli/packages/util/common.go
@@ -19,6 +19,7 @@ func GetHomeDir() (string, error) {
 	return directory, err
 }
 
+// write file to given path. If path does not exist throw error
 func WriteToFile(fileName string, dataToWrite []byte, filePerm os.FileMode) error {
 	err := os.WriteFile(fileName, dataToWrite, filePerm)
 	if err != nil {
diff --git a/cli/packages/util/config.go b/cli/packages/util/config.go
index 02e37c0a1..48bb57241 100644
--- a/cli/packages/util/config.go
+++ b/cli/packages/util/config.go
@@ -187,7 +187,7 @@ func GetConfigFile() (models.ConfigFile, error) {
 
 // Write a ConfigFile to disk. Raise error if unable to save the model to ask
 func WriteConfigFile(configFile *models.ConfigFile) error {
-	fullConfigFilePath, _, err := GetFullConfigFilePath()
+	fullConfigFilePath, fullConfigFileDirPath, err := GetFullConfigFilePath()
 	if err != nil {
 		return fmt.Errorf("writeConfigFile: unable to write config file because an error occurred when getting config file path [err=%s]", err)
 	}
@@ -197,8 +197,20 @@ func WriteConfigFile(configFile *models.ConfigFile) error {
 		return fmt.Errorf("writeConfigFile: unable to write config file because an error occurred when marshalling the config file [err=%s]", err)
 	}
 
+	// check if config folder exists and if not create it
+	if _, err := os.Stat(fullConfigFileDirPath); errors.Is(err, os.ErrNotExist) {
+		err := os.Mkdir(fullConfigFileDirPath, os.ModePerm)
+		if err != nil {
+			return err
+		}
+	}
+
 	// Create file in directory
-	err = WriteToFile(fullConfigFilePath, configFileMarshalled, os.ModePerm)
+	err = os.WriteFile(fullConfigFilePath, configFileMarshalled, os.ModePerm)
+	if err != nil {
+		return fmt.Errorf("writeConfigFile: Unable to write to file [err=%s]", err)
+	}
+
 	if err != nil {
 		return fmt.Errorf("writeConfigFile: unable to write config file because an error occurred when write the config to file [err=%s]", err)