3 files changed, 4 insertions, 5 deletions

diff --git a/editusers.cgi b/editusers.cgi
index 934e0a4ef..ae1f35835 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -24,14 +24,13 @@ use Bugzilla::Field;
 use Bugzilla::Group;
 use Bugzilla::Token;
 
-my $user = Bugzilla->login(LOGIN_REQUIRED);
-
+local our $user = Bugzilla->login(LOGIN_REQUIRED);
 my $cgi       = Bugzilla->cgi;
 my $template  = Bugzilla->template;
 my $dbh       = Bugzilla->dbh;
 my $userid    = $user->id;
 my $editusers = $user->in_group('editusers');
-local our $vars     = {};
+local our $vars = {};
 
 # Reject access if there is no sense in continuing.
 $editusers
diff --git a/token.cgi b/token.cgi
index 51ed93977..990040050 100755
--- a/token.cgi
+++ b/token.cgi
@@ -23,7 +23,7 @@ use Date::Format;
 use Date::Parse;
 use JSON qw( decode_json );
 
-my $dbh = Bugzilla->dbh;
+local our $dbh = Bugzilla->dbh;
 local our $cgi = Bugzilla->cgi;
 local our $template = Bugzilla->template;
 local our $vars = {};
diff --git a/userprefs.cgi b/userprefs.cgi
index e70b9780a..830c49eed 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -29,7 +29,7 @@ use DateTime;
 
 use constant SESSION_MAX => 20;
 
-my $template = Bugzilla->template;
+local our $template = Bugzilla->template;
 local our $vars = {};
 
 ###############################################################################