diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index bb68573fdddbd32e4adb9dcff55e732a88f22e3b..a053b5fa643bfc43174fb2817bb9451be05f7541 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -10,14 +10,13 @@
 use strict;
 use warnings;
 use utf8;
-use lib qw(lib conf);
+use lib qw(lib);
 use feature "switch";
 no warnings 'experimental::smartmatch';
 
 use Getopt::Long qw(:config auto_help);
 use Pod::Usage;
 
-use Conf;
 use IdPAccountManager::Data::AuthenticationToken;
 use IdPAccountManager::Data::AuthenticationToken::Manager;
 use IdPAccountManager::Data::ServiceProvider;
diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index dcf73ecd4001964783fa42244b0a933968a9146c..208cd4aa19664c81721a17783bc8ccecaed70924 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -10,7 +10,7 @@
 use strict;
 use warnings;
 use utf8;
-use lib qw(lib conf);
+use lib qw(lib);
 
 use IdPAccountManager::Configuration;
 use IdPAccountManager::WebRequest;
@@ -27,22 +27,22 @@ my %format        = (
     'sp_entityid' => $urn_or_url_regex,
 );
 
+my $configuration = IdPAccountManager::Configuration->new(
+    file => 'conf/IdPAccountManager.conf'
+);
+
 my %actions = (
     'select_sp'      => { 'title_en' => 'Select your Service Provider' },
     'account_wizard' => { 'title_en' => 'Select your Service Provider' },
     'generate_token' => { 'title_en' => 'Generate an authentication token' },
     'validate_token' => { 'title_en' => 'Complete Email Challenge' },
-    'home'           => { 'title_en' => $Conf::global{app_name} },
+    'home'           => { 'title_en' => $configuration->{app_name} },
 );
 
 ## Gives writes for the group
 umask 0002;
 
-chdir $Conf::global{root_manager_dir};
-
-my $configuration = IdPAccountManager::Configuration->new(
-    file => 'conf/IdPAccountManager.conf'
-);
+chdir $configuration->{root_manager_dir};
 
 my $request = new IdPAccountManager::WebRequest(
     actions       => \%actions,