diff --git a/bin/access-check-manager.cgi.in b/bin/access-check-manager.cgi.in
index db68c12a99614b5245fe72ba94ca08f76810b4dd..d2933fe9191042596c75472de9be8a92eabca0b7 100755
--- a/bin/access-check-manager.cgi.in
+++ b/bin/access-check-manager.cgi.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use strict;
 use warnings;
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 73be30b13286aa1bb646d5100d5d543924ade2c8..40d504a066f4417c72f894b29703a051c6680633 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -483,6 +483,7 @@ sub req_complete_challenge {
     );
 
     eval {
+        local $ENV{PATH} = '/bin:/sbin:/usr/bin:/usr/sbin';
         Email::Sender::Simple->send($message);
     };
     $self->abort(