diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 3440f93a20a23e87022b5062be3b978f7709b642..4d40f59d7464d27ed1cbb0f43151fbf910aebf9e 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -791,6 +791,7 @@ sub req_create_accounts {
             entityid => $self->{in}->{entityid},
             key      => $key,
             token    => $download_token->token(),
+            days     => $validity_period,
         }
     );
 }
diff --git a/templates/renater/web/create_accounts.tt2.html b/templates/renater/web/create_accounts.tt2.html
index 06a8e5bfb90a5568ca4bf57c3ee60624693689bb..78cda71b1f7df4595295a2123d54f2d73aea083f 100644
--- a/templates/renater/web/create_accounts.tt2.html
+++ b/templates/renater/web/create_accounts.tt2.html
@@ -81,7 +81,7 @@
 
 <div class="row">
     <div class="callout warning">
-        <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[_2]</strong>.", accounts_validity_period, entityid) %]</p>
+        <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[_2]</strong>.", days, entityid) %]</p>
     </div>
 </div>
 
diff --git a/templates/web/create_accounts.tt2.html b/templates/web/create_accounts.tt2.html
index c99962c419703d45057b423181924a15536df721..d2e296d4dc6b4b7be9f29037a09c001e266eb2b4 100644
--- a/templates/web/create_accounts.tt2.html
+++ b/templates/web/create_accounts.tt2.html
@@ -81,7 +81,7 @@
 
 <div class="row">
     <div class="callout warning">
-        <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[_2]</strong>.", accounts_validity_period, entityid) %]</p>
+        <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[_2]</strong>.", days, entityid) %]</p>
     </div>
 </div>