diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Invoke-ExecSetOoO.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Invoke-ExecSetOoO.ps1
index 128df28ca6a9..c0a004791254 100644
--- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Invoke-ExecSetOoO.ps1	
+++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Invoke-ExecSetOoO.ps1	
@@ -21,13 +21,22 @@ Function Invoke-ExecSetOoO {
         }
         $StartTime = $Request.body.StartTime
         $EndTime = $Request.body.EndTime
-    
+
+        $OutOfOffice = @{
+            userid          = $Request.body.user
+            InternalMessage = $InternalMessage
+            ExternalMessage = $ExternalMessage
+            TenantFilter    = $TenantFilter
+            State           = $Request.Body.AutoReplyState
+            APIName         = $APINAME
+            ExecutingUser   = $request.headers.'x-ms-client-principal'
+            StartTime       = $StartTime
+            EndTime         = $EndTime
+        }
+        Write-Host ($OutOfOffice | ConvertTo-Json -Depth 10)
+
         $Results = try {
-            if ($Request.Body.AutoReplyState -ne 'Scheduled') {
-                Set-CIPPOutOfOffice -userid $Request.body.user -tenantFilter $TenantFilter -APIName $APINAME -ExecutingUser $request.headers.'x-ms-client-principal' -InternalMessage $InternalMessage -ExternalMessage $ExternalMessage -State $Request.Body.AutoReplyState
-            } else {
-                Set-CIPPOutOfOffice -userid $Request.body.user -tenantFilter $TenantFilter -APIName $APINAME -ExecutingUser $request.headers.'x-ms-client-principal' -InternalMessage $InternalMessage -ExternalMessage $ExternalMessage -StartTime $StartTime -EndTime $EndTime -State $Request.Body.AutoReplyState
-            }
+            Set-CIPPOutOfOffice @OutOfOffice
         } catch {
             "Could not add out of office message for $($username). Error: $($_.Exception.Message)"
         }
diff --git a/Modules/CIPPCore/Public/Set-CIPPOutOfoffice.ps1 b/Modules/CIPPCore/Public/Set-CIPPOutOfoffice.ps1
index 79b6222f5c37..ee1266ca949d 100644
--- a/Modules/CIPPCore/Public/Set-CIPPOutOfoffice.ps1
+++ b/Modules/CIPPCore/Public/Set-CIPPOutOfoffice.ps1
@@ -6,7 +6,7 @@ function Set-CIPPOutOfOffice {
         $ExternalMessage,
         $TenantFilter,
         $State,
-        $APIName = "Set Out of Office",
+        $APIName = 'Set Out of Office',
         $ExecutingUser,
         $StartTime,
         $EndTime
@@ -19,19 +19,17 @@ function Set-CIPPOutOfOffice {
         if (-not $EndTime) {
             $EndTime = (Get-Date $StartTime).AddDays(7)
         }
-        if ($State -ne "Scheduled") {
-            $OutOfOffice = New-ExoRequest -tenantid $TenantFilter -cmdlet "Set-MailboxAutoReplyConfiguration" -cmdParams @{Identity = $userid; AutoReplyState = $State; InternalMessage = $InternalMessage; ExternalMessage = $ExternalMessage } -Anchor $userid
-            Write-LogMessage -user $ExecutingUser -API $APIName -message "Set Out-of-office for $($userid) to $state" -Sev "Info" -tenant $TenantFilter
+        if ($State -ne 'Scheduled') {
+            $OutOfOffice = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Set-MailboxAutoReplyConfiguration' -cmdParams @{Identity = $userid; AutoReplyState = $State; InternalMessage = $InternalMessage; ExternalMessage = $ExternalMessage } -Anchor $userid
+            Write-LogMessage -user $ExecutingUser -API $APIName -message "Set Out-of-office for $($userid) to $state" -Sev 'Info' -tenant $TenantFilter
             return "Set Out-of-office for $($userid) to $state."
-        }
-        else {
-            $OutOfOffice = New-ExoRequest -tenantid $TenantFilter -cmdlet "Set-MailboxAutoReplyConfiguration" -cmdParams @{Identity = $userid; AutoReplyState = $State; InternalMessage = $InternalMessage; ExternalMessage = $ExternalMessage; StartTime = $StartTime; EndTime = $EndTime } -Anchor $userid
-            Write-LogMessage -user $ExecutingUser -API $APIName -message "Scheduled Out-of-office for $($userid) between $StartTime and $EndTime" -Sev "Info" -tenant $TenantFilter
+        } else {
+            $OutOfOffice = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Set-MailboxAutoReplyConfiguration' -cmdParams @{Identity = $userid; AutoReplyState = $State; InternalMessage = $InternalMessage; ExternalMessage = $ExternalMessage; StartTime = $StartTime; EndTime = $EndTime } -Anchor $userid
+            Write-LogMessage -user $ExecutingUser -API $APIName -message "Scheduled Out-of-office for $($userid) between $StartTime and $EndTime" -Sev 'Info' -tenant $TenantFilter
             return "Scheduled Out-of-office for $($userid) between $($StartTime.toString()) and $($EndTime.toString())"
         }
-    }
-    catch {
-        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not add OOO for $($userid)" -Sev "Error" -tenant $TenantFilter
+    } catch {
+        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not add OOO for $($userid)" -Sev 'Error' -tenant $TenantFilter -LogData (Get-CippException -Exception $_)
         return "Could not add out of office message for $($userid). Error: $($_.Exception.Message)"
     }
 }
diff --git a/Modules/CIPPCore/Public/Set-CIPPSignature.ps1 b/Modules/CIPPCore/Public/Set-CIPPSignature.ps1
index fa2de7dc415b..e3ad3c8dd83e 100644
--- a/Modules/CIPPCore/Public/Set-CIPPSignature.ps1
+++ b/Modules/CIPPCore/Public/Set-CIPPSignature.ps1
@@ -1,4 +1,4 @@
-function Set-CIPPOutOfOffice {
+function Set-CIPPSignature {
     [CmdletBinding()]
     param (
         $userid,