diff --git a/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1 b/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
index ea894111b..92795adf5 100644
--- a/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
+++ b/Calendar/CalLogHelpers/Invoke-GetMailbox.ps1
@@ -21,14 +21,16 @@ function GetMailbox {
         [bool]$UseGetMailbox
     )
 
+    $params = @{Identity = $Identity
+        ErrorAction      = "SilentlyContinue"
+    }
+
     if ($UseGetMailbox) {
         $Cmdlet = "Get-Mailbox"
+        $params.Add("IncludeInactiveMailbox", $true)
     } else {
         $Cmdlet = "Get-Recipient"
     }
-    $params = @{Identity = $Identity
-        ErrorAction      = "SilentlyContinue"
-    }
 
     try {
         Write-Verbose "Searching $Cmdlet $(if (-not ([string]::IsNullOrEmpty($Organization))) {"with Org: $Organization"}) for $Identity."
diff --git a/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1 b/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1
index 2fa1082da..914854244 100644
--- a/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1
+++ b/Calendar/CalLogHelpers/ShortClientNameFunctions.ps1
@@ -111,6 +111,8 @@ function CreateShortClientName {
             $ShortClientName = "Outlook-ModernCalendarSharing"
         } elseif ($LogClientInfoString -like "*SkypeSpaces*") {
             $ShortClientName = "Teams"
+        } elseif ($LogClientInfoString -like "*AppId=82f45fb0-18b4-4d68-8bed-9e44909e3890*") {
+            $ShortClientName = "Teams MMS Service"
         } elseif ($LogClientInfoString -like "*AppId=7b7fdad6-df9d-4cd5-a4f2-b5f749350419*") {
             $ShortClientName = "Bookings B2 Service"
         } elseif ($LogClientInfoString -like "*bcad1a65-78eb-4725-9bce-ce1a8ed30b95*" -or