diff --git a/config/vdirsyncer/config.m4 b/config/vdirsyncer/config.m4
index bc349fd..d6f726b 100644
--- a/config/vdirsyncer/config.m4
+++ b/config/vdirsyncer/config.m4
@@ -1,38 +1,38 @@
 [general]
-status_path = ~/.vdirsyncer/status/
+status_path = "~/.vdirsyncer/status/"
 
 [pair calendars]
-a = calendars_local
-b = calendars_remote
-conflict_resolution = b wins
+a = "calendars_local"
+b = "calendars_remote"
+conflict_resolution = "b wins"
 collections = ["from b"]
 
 metadata = ["color"]
 
 [storage calendars_local]
-type = filesystem
-path = ~/.calendars/
-fileext = .ics
+type = "filesystem"
+path = "~/.calendars/"
+fileext = ".ics"
 
 [storage calendars_remote]
-type = caldav
+type = "caldav"
 url = "https://radicale.gebner.org/gebner/"
-username = gebner
-password = esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
+username = "gebner"
+password = "esyscmd(`echo -n $(pass 2b7e.org/mail.gebner.org | head -n1)')"
 
 [pair contacts]
-a = contacts_local
-b = contacts_remote
-conflict_resolution = b wins
+a = "contacts_local"
+b = "contacts_remote"
+conflict_resolution = "b wins"
 collections = ["from b"]
 
 [storage contacts_local]
-type = filesystem
-path = ~/.contacts/
-fileext = .vcf
+type = "filesystem"
+path = "~/.contacts/"
+fileext = ".vcf"
 
 [storage contacts_remote]
-type = carddav
+type = "carddav"
 url = "https://radicale.gebner.org/gebner/"
-username = gebner
-password = esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
+username = "gebner"
+password = "esyscmd(`echo -n $(pass 2b7e.org/mail.gebner.org | head -n1)')"