diff --git a/client_software/0020_nextcloud_mozilla_pre/user_run.sh b/client_software/0020_nextcloud_mozilla_pre/user_run.sh
index 5fee70d..afb98d2 100755
--- a/client_software/0020_nextcloud_mozilla_pre/user_run.sh
+++ b/client_software/0020_nextcloud_mozilla_pre/user_run.sh
@@ -115,13 +115,13 @@ if ('PROFILE_TB_DST' in environ and 'TLDOMAIN' in environ and
         'SERVERFQDN_IMAP' in environ and 'DAVTOKEN_USER' in environ):
   prefs_path = environ['PROFILE_TB_DST'] + "/default/prefs.js"
   imap_host = environ['SERVERFQDN_IMAP']
-  account_name = environ['DAVTOKEN_USER'] + "@" + environ['TLDOMAIN']
+  account_name = environ['USER'] + "@" + environ['TLDOMAIN']
 
   #Call IPA api to get the Values
   api.bootstrap(context="cli", in_server=False)
   api.finalize()
   api.Backend.rpcclient.connect()
-  api_userinfo = api.Command.user_show(environ['DAVTOKEN_USER'])
+  api_userinfo = api.Command.user_show(environ['USER'])
   user_full_name = api_userinfo['result']['givenname'][0] + " " + api_userinfo['result']['sn'][0]
   user_email = api_userinfo['result']['mail'][0]