diff --git a/home/.chezmoi.toml.tmpl b/home/.chezmoi.toml.tmpl
index 6c40d8e..2893851 100644
--- a/home/.chezmoi.toml.tmpl
+++ b/home/.chezmoi.toml.tmpl
@@ -6,14 +6,18 @@
 
 [data]
 email = {{ $email | quote }}
+mbsyncAccountNumber = {{ $mbsyncAccountNumber }}
 
 {{- if gt $mbsyncAccountNumber 0 -}}
   {{- range $i, $e := until $mbsyncAccountNumber -}}
+    {{ $mbsyncAccountName := promptString "MbSync account name " }}
+    {{ $mbsyncAccountMail := promptString "MbSync account mail " }}
+    {{ $mbsyncAccountUser := promptString "MbSync account user " }}
+    {{ $mbsyncAccountHost := promptString "MbSync account host " }}
 [[data.mbsync]]
-name = {{ promptString "MbSync account name " }}
-email = "accountEmail"
-username = "accountUserName"
-server = "accountServer"
-
+name = {{ $mbsyncAccountName | quote }}
+mail = {{ $mbsyncAccountMail | quote }}
+user = {{ $mbsyncAccountUser | quote }}
+host = {{ $mbsyncAccountHost | quote }}
   {{- end -}}
 {{- end -}}
diff --git a/home/dot_mbsyncrc.tmpl b/home/dot_mbsyncrc.tmpl
index 9257c2d..9586a57 100644
--- a/home/dot_mbsyncrc.tmpl
+++ b/home/dot_mbsyncrc.tmpl
@@ -31,9 +31,9 @@ BufferLimit 100M
 
 IMAPAccount {{ $value.name }}
 # Address to connect to
-Host {{ $value.server }}
-User {{ $value.username }}
-PassCmd "pass {{ $value.server }}/{{ $value.username }}"
+Host {{ $value.host }}
+User {{ $value.user }}
+PassCmd "pass {{ $value.host }}/{{ $value.user }}"
 # Use SSL
 # SSLType IMAPS
 SSLType None