diff --git a/client_software/0020_nextcloud_mozilla_pre/user_run.sh b/client_software/0020_nextcloud_mozilla_pre/user_run.sh
index afb98d2..090a72a 100755
--- a/client_software/0020_nextcloud_mozilla_pre/user_run.sh
+++ b/client_software/0020_nextcloud_mozilla_pre/user_run.sh
@@ -164,14 +164,14 @@ if ('PROFILE_TB_DST' in environ and 'TLDOMAIN' in environ and
         f'user_pref("mail.server.{sn}.timeout", 29);',
         f'user_pref("mail.server.{sn}.trash_folder_name", "Trash");',
         f'user_pref("mail.server.{sn}.type", "imap");',
-        f'user_pref("mail.server.{sn}.userName", "{environ["DAVTOKEN_USER"]}");',
-        f'user_pref("mail.identity.{idn}.draft_folder", "imap://{environ["DAVTOKEN_USER"]}@{imap_host}/Drafts");',
+        f'user_pref("mail.server.{sn}.userName", "{environ['USER']}");',
+        f'user_pref("mail.identity.{idn}.draft_folder", "imap://{environ['USER']}@{imap_host}/Drafts");',
         f'user_pref("mail.identity.{idn}.drafts_folder_picker_mode", "0");',
-        f'user_pref("mail.identity.{idn}.fcc_folder", "imap://{environ["DAVTOKEN_USER"]}@{imap_host}/Sent");',
+        f'user_pref("mail.identity.{idn}.fcc_folder", "imap://{environ['USER']}@{imap_host}/Sent");',
         f'user_pref("mail.identity.{idn}.fcc_folder_picker_mode", "0");',
         f'user_pref("mail.identity.{idn}.fullName", "{user_full_name}");',
         f'user_pref("mail.identity.{idn}.reply_on_top", 1);',
-        f'user_pref("mail.identity.{idn}.stationery_folder", "imap://{environ["DAVTOKEN_USER"]}@{imap_host}/Templates");',
+        f'user_pref("mail.identity.{idn}.stationery_folder", "imap://{environ['USER']}@{imap_host}/Templates");',
         f'user_pref("mail.identity.{idn}.tmpl_folder_picker_mode", "0");',
         f'user_pref("mail.identity.{idn}.useremail", "{user_email}");',
         f'user_pref("mail.identity.{idn}.valid", true);',