diff --git a/PHPCI/Application.php b/PHPCI/Application.php
index c0048adf..3378a050 100644
--- a/PHPCI/Application.php
+++ b/PHPCI/Application.php
@@ -10,6 +10,7 @@
 namespace PHPCI;
 
 use b8;
+use b8\Registry;
 use b8\Http\Response\RedirectResponse;
 use b8\View;
 
@@ -33,8 +34,11 @@ class Application extends b8\Application
         $sessionAction = ($this->controllerName == 'Session' && in_array($this->action, array('login', 'logout')));
         $externalAction = in_array($this->controllerName, array('Bitbucket', 'Github', 'BuildStatus'));
         $skipValidation = ($externalAction || $sessionAction);
-        
+
         if($skipValidation || $this->validateSession()) {
+            if ( !empty($_SESSION['user']) ) {
+                Registry::getInstance()->set('user', $_SESSION['user']);
+            }
             parent::handleRequest();
         }
 
@@ -43,7 +47,7 @@ class Application extends b8\Application
             $view->content  = $this->response->getContent();
             $this->response->setContent($view->render());
         }
-        
+
         return $this->response;
     }
 
diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php
index 21de59c9..d4cf64b6 100644
--- a/PHPCI/Controller/BuildController.php
+++ b/PHPCI/Controller/BuildController.php
@@ -89,7 +89,7 @@ class BuildController extends \PHPCI\Controller
         if (!Registry::getInstance()->get('user')->getIsAdmin()) {
             throw new \Exception('You do not have permission to do that.');
         }
-        
+
         $build  = $this->_buildStore->getById($buildId);
         $this->_buildStore->delete($build);