diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee
index 50cb673a..4c6e4481 100644
--- a/app/coffee/modules/common.coffee
+++ b/app/coffee/modules/common.coffee
@@ -28,7 +28,7 @@ DataPickerConfig = ($translate, $config, $auth) ->
     return {
         get: () ->
             user = $auth.getUser()
-            lang = user.lang || $translate.preferredLanguage()
+            lang = user?.lang || $translate.preferredLanguage()
             rtlLanguages = $config.get("rtlLanguages", [])
             isRTL = rtlLanguages.indexOf(lang) > -1
             return {
diff --git a/app/modules/services/user-list.service.coffee b/app/modules/services/user-list.service.coffee
index 1d6b79b1..0e3f0afb 100644
--- a/app/modules/services/user-list.service.coffee
+++ b/app/modules/services/user-list.service.coffee
@@ -27,7 +27,7 @@ class UserListService
     ]
 
     constructor: (@currentUserService, @projectService) ->
-        @.currentUser = @currentUserService.getUser().toJS()
+        @.currentUser = @currentUserService.getUser()?.toJS()
 
     filterUsers: (text, user) ->
         username = user.full_name_display.toUpperCase()