diff --git a/ExecConverttoSharedMailbox/run.ps1 b/ExecConverttoSharedMailbox/run.ps1
index 055b0c5b1e0d..9ecbb30b2236 100644
--- a/ExecConverttoSharedMailbox/run.ps1
+++ b/ExecConverttoSharedMailbox/run.ps1
@@ -14,14 +14,10 @@ Write-Host "PowerShell HTTP trigger function processed a request."
 # Interact with query parameters or the body of the request.
 Try {
     $MailboxType = if ($request.query.ConvertToUser -eq 'true') { "Regular" } else { "Shared" }
-    $tenantfilter = $Request.Query.TenantFilter 
-    New-ExoRequest -tenantid $TenantFilter -cmdlet "Set-mailbox" -cmdParams @{Identity = $request.query.id; type = $MailboxType }
-
-    $Results = [pscustomobject]@{"Results" = "Successfully converted $($request.query.id)." }
-    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($tenantfilter) -message "Converted mailbox $($request.query.id)" -Sev "Info"
+    $ConvertedMailbox = Set-CIPPMailboxType -userid $Request.query.id -tenantFilter $Request.query.TenantFilter -APIName $APINAME -ExecutingUser $request.headers.'x-ms-client-principal' -MailboxType $MailboxType
+    $Results = [pscustomobject]@{"Results" = "$ConvertedMailbox" }
 }
 catch {
-    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($tenantfilter) -message "Convert to shared mailbox failed: $($_.Exception.Message)" -Sev "Error"
     $Results = [pscustomobject]@{"Results" = "Failed to convert $($request.query.id) - $($_.Exception.Message)" }
 }
 # Associate values to output bindings by calling 'Push-OutputBinding'.
diff --git a/Modules/CIPPCore/Public/Set-CIPPMailboxType.ps1 b/Modules/CIPPCore/Public/Set-CIPPMailboxType.ps1
index e559c4557711..03fc1236f269 100644
--- a/Modules/CIPPCore/Public/Set-CIPPMailboxType.ps1
+++ b/Modules/CIPPCore/Public/Set-CIPPMailboxType.ps1
@@ -13,6 +13,7 @@ function Set-CIPPMailboxType {
     try {
         $Mailbox = New-ExoRequest -tenantid $TenantFilter -cmdlet "Set-mailbox" -cmdParams @{Identity = $userid; type = $MailboxType } -Anchor $username
         Write-LogMessage -user $ExecutingUser -API $APIName -message "Converted $($username) to a $MailboxType mailbox" -Sev "Info" -tenant $TenantFilter
+        if (!$username) { $username = $userid }
         return "Converted $($username) to a $MailboxType mailbox"
     }
     catch {