diff --git a/bin/access-check-manager.pl.in b/bin/access-check-manager.pl.in
index bfd840a3afa6073939ca340ea2d82adf695a56d2..c0454938117691f9148f9f48ca56568f796ff7c3 100755
--- a/bin/access-check-manager.pl.in
+++ b/bin/access-check-manager.pl.in
@@ -320,7 +320,7 @@ sub add_token {
     }
 
     # compute a new token
-    my $validity_period = $configuration->{_}->{tokens_validity_period};
+    my $validity_period = $configuration->{service}->{tokens_validity_period};
     my $token = AccountManager::Token->new(
         db              => $db,
         email_address   => $options{email_address},
diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index 2a74e310a90094ca81c1f5417713f8af9a63f935..ebe24fdd54395a94891a8dd1a0fe850bcc1ad20f 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -1,7 +1,3 @@
-
-# Token validity period, in hours
-tokens_validity_period = 2
-
 [app]
 support_email = support@my.fqdn
 
@@ -35,8 +31,10 @@ displayname = eduGAIN Access Check
 
 # default parameters for all services
 [service]
-# validity period of test accounts, in days
+# test accounts validity period, in days
 account_validity_period = 7
+# token validity period, in hours
+tokens_validity_period = 2
 # valid account profiles
 account_profiles = fullset1, limitedset1, generic1, student1, student2, teacher1, teacher2, alumni1, librarywalkin1, employee1, researcher1
 # override contacts defined in metadata if defined
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 307e26ea3205e2d590f12b5586e9dbedfa22cf68..1a8bbc4eb0c1d775a7e2daae4062fa2119051cc6 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -398,7 +398,7 @@ sub req_complete_challenge {
 
     # compute a new token
     my $validity_period =
-        $self->{configuration}->{_}->{tokens_validity_period};
+        $self->{configuration}->{service}->{tokens_validity_period};
     my $token = AccountManager::Token->new(
         db              => $self->{db},
         email_address   => $self->{in}->{email},