diff --git a/site/app_controller.php b/site/app_controller.php
index 168eeb5..d15ad87 100644
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -296,6 +296,7 @@ class AppController extends Controller {
    */
 
   function beforeFilter() {
+    $this->params['user']  = $this->Permission->User->currentUser();
     $this->params['dev']   = $this->Option->enabled('dev');
     $this->params['admin'] = $this->Option->enabled('admin');
 
@@ -312,10 +313,10 @@ class AppController extends Controller {
 	$this->sideMenuEnable($area_name, $this->admin_area, false);
     }
 
-    $this->authorize("controller.{$this->params['controller']}");
     $this->authorize("controller.{$this->params['controller']}");
     $this->authorize("action.{$this->params['controller']}.{$this->params['action']}");
-    $this->authorize("action.{$this->params['controller']}.{$this->params['action']}");
+
+    $this->log($this->params, 'request');
   }
 
 
diff --git a/site/models/user.php b/site/models/user.php
index ed94057..46662a8 100644
--- a/site/models/user.php
+++ b/site/models/user.php
@@ -8,19 +8,21 @@ class User extends AppModel {
 
   static $current_user_id;
 
+  function currentUser() {
+    if (!empty($_SERVER['REMOTE_USER']))
+      return $_SERVER['REMOTE_USER'];
+
+    return null;
+  }
+
   function currentUserId() {
     if (!empty(self::$current_user_id))
       return self::$current_user_id;
 
-    if (!empty($_SERVER['REMOTE_USER']))
-      $login = $_SERVER['REMOTE_USER'];
-    else
-      $login = null;
-
     $user = $this->find
       ('first',
        array('recursive' => -1,
-	     'conditions' => compact('login')));
+	     'conditions' => array('login' => $this->currentUser())));
 
     if (!empty($user['User']['id']))
       self::$current_user_id = $user['User']['id'];