diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index 922fe20f9d844b8ccf32a36ff25fc916927da5f8..44b453b5d5eb9c3d1c03267eaf7b8c86b422c0e3 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -48,7 +48,7 @@ options  = mysql_enable_utf8
 [idp]
 scope = my.fqdn
 entityid = https://my.fqdn/simplesaml/saml2/idp/metadata.php
-displayname = eduGAIN Access Check
+name = eduGAIN Access Check
 
 # default parameters for all services
 [service]
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 57f1307fdc484bfa25f55f6ab2ba66c1a89e72ea..e5acaa4fc3c248fd06887a4256c23003818a0dc1 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -646,6 +646,7 @@ sub req_create_accounts {
             action   => 'create_accounts',
             accounts => \@accounts,
             entityid => $entityid,
+            idp      => $self->{configuration}->{idp}->{name},
             url      => $sp->information_url(),
             email    => $email,
             key      => $key,
diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index f8d3e03dca253d8874eaa29c05096b8028bcff9f..4fed7df3ac7bed05cafba3e17bd040e389690913 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -8,7 +8,7 @@
 <h2>[% lh.maketext("Test accounts created") %]</h2>
 <p>
 [% lh.maketext("You can now use these test accounts to login at your <a href=\"[_1]\">service provider</a>.", url) %]
-[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp_displayname) %]
+[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp) %]
 </p>
 
 <p><a class="button" href="[% app.url %]?action=download_accounts&entityid=[% entityid %]&token=[% token %]&key=[% key %]">[% lh.maketext("Download in CSV format") %]</a></p>
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index c3e3b787106fd99c81d34f299b2f9ac7c87f180d..10d979863c4b04436a3d5c679b636a8ab81ef0d9 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -10,7 +10,7 @@
 <h2>[% lh.maketext("Test accounts created") %]</h2>
 <p>
 [% lh.maketext("You can now use these test accounts to login at your <a href=\"[_1]\">service provider</a>.", url) %]
-[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp_displayname) %]
+[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp) %]
 </p>
 
 <p><a class="button" href="[% app.url %]?action=download_accounts&entityid=[% entityid %]&token=[% token %]&key=[% key %]">[% lh.maketext("Download in CSV format") %]</a></p>