diff --git a/frontend/src/i18n/lang/en.json b/frontend/src/i18n/lang/en.json
index 53e89cf16..699c01094 100644
--- a/frontend/src/i18n/lang/en.json
+++ b/frontend/src/i18n/lang/en.json
@@ -147,15 +147,15 @@
       },
       "caldav": {
         "title": "CalDAV",
-        "howTo": "You can connect Vikunja to CalDAV clients to view and manage all tasks from different clients. Enter this url into your client:",
+        "howTo": "You can connect Vikunja to CalDAV clients to view and manage all your tasks from different clients. Enter this URL into your client:",
         "more": "More information about CalDAV in Vikunja",
         "tokens": "CalDAV Tokens",
-        "tokensHowTo": "You can use a CalDAV token to use instead of a password to log in the above endpoint.",
-        "createToken": "Create a token",
-        "tokenCreated": "Here is your token: {token}",
-        "wontSeeItAgain": "Write it down, you won't be able to see it again.",
-        "mustUseToken": "You need to create a CalDAV token if you want to use CalDAV with a third party client. Use the token as the password.",
-        "usernameIs": "Your username is: {0}"
+        "tokensHowTo": "For CalDAV authentication you can use either your normal account password or a dedicated CalDAV token.",
+        "createToken": "Create a CalDAV token",
+        "tokenCreated": "Here is your new token: {token}",
+        "wontSeeItAgain": "Write it down or save it securely — you will not be able to see it again.",
+        "mustUseToken": "You need to create a CalDAV token to use CalDAV with any third-party client. Enter the token in the password field of your client.",
+        "usernameIs": "Your username for CalDAV is: {0}"
       },
       "avatar": {
         "title": "Avatar",
diff --git a/frontend/src/views/user/settings/Caldav.vue b/frontend/src/views/user/settings/Caldav.vue
index bc79e6972..0525b9867 100644
--- a/frontend/src/views/user/settings/Caldav.vue
+++ b/frontend/src/views/user/settings/Caldav.vue
@@ -27,15 +27,13 @@
 
 		<p>
 			{{ isLocalUser ? $t('user.settings.caldav.tokensHowTo') : $t('user.settings.caldav.mustUseToken') }}
-			<template v-if="!isLocalUser">
-				<br>
-				<i18n-t
-					keypath="user.settings.caldav.usernameIs"
-					scope="global"
-				>
-					<strong>{{ username }}</strong>
-				</i18n-t>
-			</template>
+			<br>
+			<i18n-t
+				keypath="user.settings.caldav.usernameIs"
+				scope="global"
+			>
+				<strong>{{ username }}</strong>
+			</i18n-t>
 		</p>
 
 		<table