diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
index 5e63741b..2ec6c954 100644
--- a/api/businesslogic/security/UserContextBuilder.php
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -11,27 +11,53 @@ class UserContextBuilder {
 
     /**
      * Builds a user context based on the current session. **The session must be active!**
+     * @param $dataRow array the $_SESSION superglobal or the hesk_users result set
      * @return UserContext the built user context
      */
-    static function fromSession() {
+    static function fromSession($dataRow) {
         require_once(__DIR__ . '/UserContext.php');
         require_once(__DIR__ . '/UserContextPreferences.php');
+        require_once(__DIR__ . '/UserContextNotifications.php');
 
         $userContext = new UserContext();
-        $userContext->id = $_SESSION['id'];
-        $userContext->username = $_SESSION['user'];
-        $userContext->admin = $_SESSION['isadmin'];
-        $userContext->name = $_SESSION['name'];
-        $userContext->email = $_SESSION['email'];
-        $userContext->signature = $_SESSION['signature'];
-        $userContext->language = $_SESSION['language'];
-        $userContext->categories = explode(',', $_SESSION['categories']);
+        $userContext->id = $dataRow['id'];
+        $userContext->username = $dataRow['user'];
+        $userContext->admin = $dataRow['isadmin'];
+        $userContext->name = $dataRow['name'];
+        $userContext->email = $dataRow['email'];
+        $userContext->signature = $dataRow['signature'];
+        $userContext->language = $dataRow['language'];
+        $userContext->categories = explode(',', $dataRow['categories']);
+        $userContext->permissions = explode(',', $dataRow['heskprivileges']);
+        $userContext->autoAssign = $dataRow['autoassign'];
+        $userContext->ratingNegative = $dataRow['ratingneg'];
+        $userContext->ratingPositive = $dataRow['ratingpos'];
+        $userContext->rating = $dataRow['rating'];
+        $userContext->totalNumberOfReplies = $dataRow['replies'];
+        $userContext->active = $dataRow['active'];
 
         $preferences = new UserContextPreferences();
-        $preferences->afterReply = $_SESSION['afterreply'];
-        $preferences->autoStartTimeWorked = $_SESSION['autostart'];
-        $preferences-
+        $preferences->afterReply = $dataRow['afterreply'];
+        $preferences->autoStartTimeWorked = $dataRow['autostart'];
+        $preferences->autoreload = $dataRow['autoreload'];
+        $preferences->defaultNotifyCustomerNewTicket = $dataRow['notify_customer_new'];
+        $preferences->defaultNotifyCustomerReply = $dataRow['notify_customer_reply'];
+        $preferences->showSuggestedKnowledgebaseArticles = $dataRow['show_suggested'];
+        $preferences->defaultCalendarView = $dataRow['default_calendar_view'];
+        $preferences->defaultTicketView = $dataRow['default_list'];
+        $userContext->preferences = $preferences;
 
+        $notifications = new UserContextNotifications();
+        $notifications->newUnassigned = $dataRow['notify_new_unassigned'];
+        $notifications->newAssignedToMe = $dataRow['notify_new_my'];
+        $notifications->replyUnassigned = $dataRow['notify_reply_unassigned'];
+        $notifications->replyToMe = $dataRow['notify_reply_my'];
+        $notifications->ticketAssignedToMe = $dataRow['notify_assigned'];
+        $notifications->privateMessage = $dataRow['notify_pm'];
+        $notifications->noteOnTicketAssignedToMe = $dataRow['notify_note'];
+        $notifications->noteOnTicketNotAssignedToMe = $dataRow['notify_note_unassigned'];
+        $notifications->overdueTicketUnassigned = $dataRow['notify_overdue_unassigned'];
+        $userContext->notificationSettings = $notifications;
 
         return $userContext;
     }
diff --git a/api/businesslogic/security/UserContextNotifications.php b/api/businesslogic/security/UserContextNotifications.php
index caada957..aab70faa 100644
--- a/api/businesslogic/security/UserContextNotifications.php
+++ b/api/businesslogic/security/UserContextNotifications.php
@@ -14,6 +14,7 @@ class UserContextNotifications {
     public $newAssignedToMe;
     public $replyUnassigned;
     public $replyToMe;
+    public $ticketAssignedToMe;
     public $privateMessage;
     public $noteOnTicketAssignedToMe;
     public $noteOnTicketNotAssignedToMe;