diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index 69830a2f..9bc9b57a 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -69,18 +69,18 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
     loadMembers: ->
         return @rs.memberships.list(@scope.projectId, {}, false).then (data) =>
             currentUser = @auth.getUser()
-            if not currentUser.photo?
+            if currentUser? and not currentUser.photo?
                 currentUser.photo = "/images/unnamed.png"
 
             @scope.currentUser = _.find data, (membership) =>
-                return membership.user == currentUser.id
+                return currentUser? and membership.user == currentUser.id
 
             @scope.totals = {}
             _.forEach data, (membership) =>
                 @scope.totals[membership.user] = 0
 
             @scope.memberships = _.filter data, (membership) =>
-                if membership.user && membership.user != currentUser.id && membership.is_user_active
+                if membership.user && (not currentUser? or membership.user != currentUser.id) && membership.is_user_active
                     return membership
 
             for membership in @scope.memberships
diff --git a/app/partials/project/project-menu.jade b/app/partials/project/project-menu.jade
index beb4a7f8..78a41e71 100644
--- a/app/partials/project/project-menu.jade
+++ b/app/partials/project/project-menu.jade
@@ -44,6 +44,7 @@ div(class="menu-container")
                 span(class="icon icon-settings")
                 span(class="item") Admin
         <% } %>
+    <% if (user) { %>
     div(class="user")
         div(class="user-settings")
             ul(class="popover")
@@ -61,3 +62,4 @@ div(class="menu-container")
                     a(href="" title="Logout" class="logout") Logout
             a(href="" title="User preferences" class="avatar" id="nav-user-settings")
                 img(src!="<%- user.photo %>" alt!="<%- user.full_name_display %>")
+    <% } %>