Index: trunk/admin/category/category_maint.php
===================================================================
diff -u -r534 -r540
--- trunk/admin/category/category_maint.php	(.../category_maint.php)	(revision 534)
+++ trunk/admin/category/category_maint.php	(.../category_maint.php)	(revision 540)
@@ -189,7 +189,7 @@
      $percent = (int)(($CatIndex/$NumCats) * 100);
   }
   
-  if(is_numeric($_GET["CatIndex"]))
+  if( is_numeric( GetVar('CatIndex') ) )
   {
 		if ($percent == 0)
 		{
Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -r534 -r540
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 534)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 540)
@@ -409,6 +409,7 @@
         }
         
         $this->Set("PortalUserId", $result->fields["PortalUserId"]);
+        unset($this->CurrentUser);
         if(strlen($result->fields["tz"])>0)
             $this->Set("tz",$result->fields["tz"]);
 		$PrimaryGroup=0;
@@ -515,9 +516,13 @@
       if($userid > 0)
       {       
             if(!is_object($this->CurrentUser))
-                $this->CurrentUser = $objUsers->GetItem($this->Get("PortalUserId"));
+            {
+                $this->CurrentUser = $objUsers->GetItem($userid);
+            }
             if(!$this->CurrentUser->VarsLoaded)
+            {
                 $this->CurrentUser->LoadPersistantVars();
+            }
 			//echo "setting current user' $variableName, $variableValue<br>";
             $this->CurrentUser->SetPersistantVariable($variableName, $variableValue); 
             //$this->SetVariable($variableName,$variableValue);      
@@ -530,12 +535,17 @@
 	{
           global $objConfig, $objUsers;
 
-          if(is_numeric($this->Get("PortalUserId")))
+          $UserID = $this->Get("PortalUserId");
+          if(is_numeric($UserID))
           {
             if(!is_object($this->CurrentUser))
-                $this->CurrentUser = $objUsers->GetItem($this->Get("PortalUserId"));
+            {
+                $this->CurrentUser = $objUsers->GetItem($UserID);
+            }
             if(!$this->CurrentUser->VarsLoaded)
+            {
                 $this->CurrentUser->LoadPersistantVars();
+            }
             $val = $this->CurrentUser->GetPersistantVariable($variableName);
           }
           if(!strlen($val))
Index: trunk/admin/category/addpermission_modules.php
===================================================================
diff -u -r534 -r540
--- trunk/admin/category/addpermission_modules.php	(.../addpermission_modules.php)	(revision 534)
+++ trunk/admin/category/addpermission_modules.php	(.../addpermission_modules.php)	(revision 540)
@@ -261,7 +261,7 @@
      {     
        echo "<TR ".int_table_color_ret().">";
        echo "<TD><IMG src=\"".$imagesURL."/itemicons/icon16_permission.gif\"> ";
-       $getvar = "?env=".BuildEnv()."&module=$module&GroupId=$GroupId";
+       $getvar = "?env=".BuildEnv()."&module=$module&GroupId=$GroupId&en=".GetVar('en');
        echo "<A class=\"NAV_URL\" HREF=\"".$adminURL."/category/addpermission.php$getvar\">$module</A></TD>";
        echo "</TR>";
      }
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -r534 -r540
--- trunk/kernel/include/modules.php	(.../modules.php)	(revision 534)
+++ trunk/kernel/include/modules.php	(.../modules.php)	(revision 540)
@@ -285,7 +285,7 @@
         {        
           foreach ($mod_prefix as $key=>$value)
           {
-            if(_ModuleLicensed($modules_loaded[$key]) || $key=="m")
+            if($key != 'bbcat' && _ModuleLicensed($modules_loaded[$key]) || $key=="m")
             {
                 $mod[$key] = $value;
             }
@@ -864,15 +864,15 @@
 {
  foreach($mod_prefix as $key => $folder_name)
  {
-    if($FrontEnd==0 || !is_numeric($FrontEnd) || $FrontEnd==2)
+    if( $FrontEnd==0 || !is_numeric($FrontEnd) || $FrontEnd==2)
     { 
 	  $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
 	  $admin = $objConfig->Get("AdminDirectory");
 	  if( !strlen($admin) ) $admin = "admin";
 	  $adminURL = $rootURL.$admin;
       $imagesURL = $adminURL."/images"; 	
       
-      if(_ModuleLicensed($modules_loaded[$key]))
+      if( $key != 'bbcat' && _ModuleLicensed($modules_loaded[$key]) )
       {           	  
         $mod = $pathtoroot.$folder_name."module_init.php";
         if( file_exists($mod) ) require_once($mod);