2 files changed, 11 insertions, 1 deletions
diff --git a/torrus/perllib/Torrus/Renderer/Freeside.pm b/torrus/perllib/Torrus/Renderer/Freeside.pm
index 8d93415..9a7c023 100644
--- a/torrus/perllib/Torrus/Renderer/Freeside.pm
+++ b/torrus/perllib/Torrus/Renderer/Freeside.pm
@@ -6,10 +6,16 @@ use base 'Torrus::Freeside';
 use FS::UID qw(cgisuidsetup);
 use FS::TicketSystem;
 
+our $cgi = '';
+
 sub freesideSetup {
   #my $self = shift;
 
-  cgisuidsetup($Torrus::CGI::q);
+  return if $cgi eq $Torrus::CGI::q;
+
+  $cgi = $Torrus::CGI::q;
+
+  cgisuidsetup($cgi);
   FS::TicketSystem->init();
 
 }
diff --git a/torrus/perllib/Torrus/ReportOutput/Freeside.pm b/torrus/perllib/Torrus/ReportOutput/Freeside.pm
index 47db28d..f04ac61 100644
--- a/torrus/perllib/Torrus/ReportOutput/Freeside.pm
+++ b/torrus/perllib/Torrus/ReportOutput/Freeside.pm
@@ -6,9 +6,13 @@ use base 'Torrus::Freeside';
 use FS::UID qw(adminsuidsetup);
 use FS::TicketSystem;
 
+our $issetup = 0;
+
 sub freesideSetup {
   #my $self = shift;
 
+  return if $issetup++;
+
   adminsuidsetup('fs_queue'); #XXX for now
   FS::TicketSystem->init();