diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index 6f34d79012a5b56277b5f5d03dbb3a40b3045a1c..52f39429274ac50450c834996cc1d76c7f1ce849 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -15,6 +15,7 @@ use lib qw(lib conf);
 use Getopt::Long qw(:config auto_help);
 use Pod::Usage;
 
+use Conf;
 use IdPAccountManager::TestAccount;
 use IdPAccountManager::SAMLMetadata;
 use IdPAccountManager::ServiceProvider;
diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index 57cadd97f28ecac9ed74e4dd2ad627a79322741a..a6e37d4cd4348a346a9b018592d2ba2fc2d19660 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -18,6 +18,7 @@ use CGI::Util;
 use Template;
 use Template::Constants qw( :debug );
 
+use Conf;
 use IdPAccountManager::TestAccount;
 use IdPAccountManager::SAMLMetadata;
 use IdPAccountManager::ServiceProvider;
diff --git a/lib/IdPAccountManager/AuthenticationToken.pm b/lib/IdPAccountManager/AuthenticationToken.pm
index 992cbda6581164baeae02456d4c3ceaf53787e6e..766066165c285e99532472bbbeb9cc39bbc68d63 100644
--- a/lib/IdPAccountManager/AuthenticationToken.pm
+++ b/lib/IdPAccountManager/AuthenticationToken.pm
@@ -10,8 +10,6 @@ use warnings;
 use IdPAccountManager::Data::AuthenticationToken;
 use IdPAccountManager::Data::AuthenticationToken::Manager;
 
-use Conf;
-
 use Digest::MD5;
 use POSIX qw(strftime);
 
diff --git a/lib/IdPAccountManager/SAMLMetadata.pm b/lib/IdPAccountManager/SAMLMetadata.pm
index 1cbfdad7d6403a4ff9411a8710a059ac37a1e880..909e222f2422b48cc259ac47afd4b516ae39da55 100644
--- a/lib/IdPAccountManager/SAMLMetadata.pm
+++ b/lib/IdPAccountManager/SAMLMetadata.pm
@@ -9,7 +9,6 @@ use warnings;
 
 use IdPAccountManager::Tools;
 use IdPAccountManager::Logger;
-use Conf;
 
 use XML::LibXML;
 
diff --git a/lib/IdPAccountManager/Tools.pm b/lib/IdPAccountManager/Tools.pm
index c5c20b706bbe1dfccd56d1532370c0f1c0e663dc..477ed345a325ec801a000078478a63a66651009a 100644
--- a/lib/IdPAccountManager/Tools.pm
+++ b/lib/IdPAccountManager/Tools.pm
@@ -4,6 +4,7 @@ package IdPAccountManager::Tools;
 ## This software was developed by RENATER. The research leading to these results has received funding
 ## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
 
+use Conf;
 use Template;
 
 # load Template::Stash to make method tables visible
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index 21a83963dc142f5825ff744ab29da3e0be1810c0..e6f41f0a9d1964394a49150a254841c5a3cb3898 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use IdPAccountManager::Logger;
+use Conf;
 
 ## New web request
 sub new {