diff --git a/private_dot_config/git/config.tmpl b/private_dot_config/git/config.tmpl
index ad0c025..5b221fc 100644
--- a/private_dot_config/git/config.tmpl
+++ b/private_dot_config/git/config.tmpl
@@ -13,8 +13,14 @@
     {{- $gitConfig = $currentUser.configs.git -}}
   {{- end -}}
 {{- end -}}
-{{- $gitName := $gitConfig.name | default "Xavier Logerais" -}}
-{{- $gitEmail := $gitConfig.email | default "xavier@logerais.com" -}}
+{{- $gitName := "Xavier Logerais" -}}
+{{- $gitEmail := "xavier@logerais.com" -}}
+{{- if hasKey $gitConfig "name" -}}
+  {{- $gitName = $gitConfig.name -}}
+{{- end -}}
+{{- if hasKey $gitConfig "email" -}}
+  {{- $gitEmail = $gitConfig.email -}}
+{{- end -}}
 [core]
 	excludesfile = ~/.config/git/ignore
 	attributesfile = ~/.config/git/attributes