diff --git a/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl b/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl
index 443008731d93..be5b21465e46 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl
@@ -1,11 +1,11 @@
-Hallo #if($notification.password.user.identity)Benutzer $password_user_name#{else}Angehörige/r der Site $password_user_department#end,
+Hallo #if($notification.password.inheriteduser.identity)Benutzer $password_inheriteduser_name#{else}Angehörige/r der Site $password_inheriteduser_department#end,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
-   • Benutzername:           $password_user_name
-   • Benutzer Site:          $password_user_department
+   • Benutzername:           $password_inheriteduser_name
+   • Benutzer Site:          $password_inheriteduser_department
 
    • Passwort Ablauf:        $password_expiration
 
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword.vsl b/core/src/main/resources/ctsms-notification-expiringpassword.vsl
index e918f1e3e0fb..9b9717f7de9c 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword.vsl
@@ -1,11 +1,11 @@
-Dear #if($notification.password.user.identity)user $password_user_name#{else}member of site $password_user_department#end,
+Dear #if($notification.password.inheriteduser.identity)user $password_inheriteduser_name#{else}member of site $password_inheriteduser_department#end,
 
 this is a notification for the following event:
 
    $type
 
-   • Username:            $password_user_name
-   • User site:           $password_user_department
+   • Username:            $password_inheriteduser_name
+   • User site:           $password_inheriteduser_department
 
    • Password expiration: $password_expiration