X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCurrentUser.pm;h=bcd337d2c37d039a8250f18023c4c2d830c25e7a;hb=3c54c844c665ed108c7892a154fd3972fab1f3e5;hp=a2dfd714c586e94932ab1a42256624f0c635690a;hpb=22beb7aa1be0c71984c87fed7982299c315ce254;p=freeside.git

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
index a2dfd714c..bcd337d2c 100644
--- a/FS/FS/CurrentUser.pm
+++ b/FS/FS/CurrentUser.pm
@@ -22,7 +22,7 @@ sub load_user {
   my( $class, $user ) = @_; #, $pass
 
   if ( $upgrade_hack ) {
-    return new FS::CurrentUser::BootstrapUser;
+    return $CurrentUser = new FS::CurrentUser::BootstrapUser;
   }
 
   #return "" if $user =~ /^fs_(queue|selfservice)$/;
@@ -36,6 +36,7 @@ sub load_user {
   $CurrentUser = qsearchs('access_user', {
     'username' => $user,
     #'_password' =>
+    'disabled' => '',
   } );
 
   die "unknown user: $user" unless $CurrentUser; # or bad password