diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js
index 3a25f00bc..4f1d81000 100644
--- a/dashboard/src/js/client.js
+++ b/dashboard/src/js/client.js
@@ -3910,8 +3910,12 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             return 'Apps of ' + data.oldOwnerId + ' was transferred to ' + data.newOwnerId;
 
         case ACTION_USER_LOGIN:
-            app = this.getCachedAppSync(data.appId);
-            return 'User ' + (data.user ? data.user.username : data.userId) + ' logged in to ' + (app ? app.fqdn : data.appId);
+            if (data.mailboxId) {
+                return 'User ' + (data.user ? data.user.username : data.userId) + ' logged in to mailbox ' + data.mailboxId;
+            } else {
+                app = this.getCachedAppSync(data.appId);
+                return 'User ' + (data.user ? data.user.username : data.userId) + ' logged in to ' + (app ? app.fqdn : data.appId);
+            }
 
         case ACTION_USER_LOGIN_GHOST:
             return 'User ' + (data.user ? data.user.username : data.userId) + ' was impersonated';