diff --git a/handlers/ssh_config/analyzer/values.go b/handlers/ssh_config/analyzer/values.go
index 7a5961c..08c383d 100644
--- a/handlers/ssh_config/analyzer/values.go
+++ b/handlers/ssh_config/analyzer/values.go
@@ -29,7 +29,7 @@ func analyzeValuesAreValid(
 
 			errs = append(errs, common.LSPError{
 				Range: option.Key.LocationRange,
-				Err:   errors.New(fmt.Sprintf("Unknown option: %s", option.Key.Key)),
+				Err:   errors.New(fmt.Sprintf("Unknown option: %s", option.Key.Value.Value)),
 			})
 
 			continue
diff --git a/handlers/ssh_config/handlers/completions.go b/handlers/ssh_config/handlers/completions.go
index 675202b..342cb7b 100644
--- a/handlers/ssh_config/handlers/completions.go
+++ b/handlers/ssh_config/handlers/completions.go
@@ -39,7 +39,9 @@ func GetRootCompletions(
 
 	return utils.MapMapToSlice(
 		availableOptions,
-		func(name fields.NormalizedOptionName, doc docvalues.DocumentationValue) protocol.CompletionItem {
+		func(normalizedName fields.NormalizedOptionName, doc docvalues.DocumentationValue) protocol.CompletionItem {
+			name := fields.FieldsNameFormattedMap[normalizedName]
+
 			completion := &protocol.CompletionItem{
 				Label:         string(name),
 				Kind:          &kind,