diff --git a/bin/access-check-manager.pl b/bin/access-check-manager.pl
index 90c51582b6093c7efa1442cd45b86f87114f30ac..a0a1f53901b292d6c368d7581d5e46a23f7e5756 100755
--- a/bin/access-check-manager.pl
+++ b/bin/access-check-manager.pl
@@ -44,7 +44,7 @@ pod2usage(
     -verbose => 0
 ) unless $action;
 
-my $configuration_file = $ENV{MOJO_CONFIG} || 'conf/manager.conf';
+my $configuration_file = $ENV{ACCESS_CHECK_CONFIG} || 'conf/manager.conf';
 my $configuration = Config::Tiny->read($configuration_file);
 if (!$configuration) {
     die Config::Tiny->errstr() . "\n";
@@ -56,7 +56,11 @@ AccountManager::DB->register_db(
     host     => $configuration->{database}->{host},
     password => $configuration->{database}->{password},
     username => $configuration->{database}->{username},
-    options  => [ split(/, */, $configuration->{database}->{options}) ]
+    options  => [
+        $configuration->{database}->{options} ?
+            split(/, */, $configuration->{database}->{options}) :
+            ()
+    ]
 );
 
 my $db = AccountManager::DB->new();
diff --git a/bin/update-metadata b/bin/update-metadata
index 0a7825762bcd6fdfed14b4ca91c23660ef9a49f8..1f1506485b02707494992c422b9dffbb68218050 100755
--- a/bin/update-metadata
+++ b/bin/update-metadata
@@ -28,7 +28,7 @@ GetOptions(
     -verbose => 0
 );
 
-my $configuration_file = $ENV{MOJO_CONFIG} || 'conf/manager.conf';
+my $configuration_file = $ENV{ACCESS_CHECK_CONFIG} || 'conf/manager.conf';
 my $configuration = Config::Tiny->read($configuration_file);
 if (!$configuration) {
     die Config::Tiny->errstr() . "\n";
@@ -46,7 +46,11 @@ AccountManager::DB->register_db(
     host     => $configuration->{database}->{host},
     password => $configuration->{database}->{password},
     username => $configuration->{database}->{username},
-    options  => [ split(/, */, $configuration->{database}->{options}) ]
+    options  => [
+        $configuration->{database}->{options} ?
+            split(/, */, $configuration->{database}->{options}) :
+            ()
+    ]
 );
 
 my $db = AccountManager::DB->new();