diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 4d97323f3b..a44ef63fb0 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -87,6 +87,7 @@ App::post('/v1/messaging/providers/mailgun')
   ->desc('Create Mailgun Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -119,6 +120,7 @@ App::patch('/v1/messaging/providers/:id/mailgun')
   ->desc('Update Mailgun Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -173,6 +175,7 @@ App::post('/v1/messaging/providers/sendgrid')
   ->desc('Create Sendgrid Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -203,6 +206,7 @@ App::patch('/v1/messaging/providers/:id/sendgrid')
   ->desc('Update Sendgrid Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -252,6 +256,7 @@ App::post('/v1/messaging/providers/msg91')
   ->desc('Create Msg91 Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -284,6 +289,7 @@ App::patch('/v1/messaging/providers/:id/msg91')
   ->desc('Update Msg91 Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -338,6 +344,7 @@ App::post('/v1/messaging/providers/telesign')
   ->desc('Create Telesign Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -370,6 +377,7 @@ App::patch('/v1/messaging/providers/:id/telesign')
   ->desc('Update Telesign Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -424,6 +432,7 @@ App::post('/v1/messaging/providers/textmagic')
   ->desc('Create Textmagic Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -456,6 +465,7 @@ App::patch('/v1/messaging/providers/:id/textmagic')
   ->desc('Update Textmagic Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -510,6 +520,7 @@ App::post('/v1/messaging/providers/twilio')
   ->desc('Create Twilio Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -542,6 +553,7 @@ App::patch('/v1/messaging/providers/:id/twilio')
   ->desc('Update Twilio Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -596,6 +608,7 @@ App::post('/v1/messaging/providers/vonage')
   ->desc('Create Vonage Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -628,6 +641,7 @@ App::patch('/v1/messaging/providers/:id/vonage')
   ->desc('Update Vonage Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -685,6 +699,7 @@ App::post('/v1/messaging/providers/fcm')
   ->desc('Create FCM Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -715,6 +730,7 @@ App::patch('/v1/messaging/providers/:id/fcm')
   ->desc('Update FCM Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -759,6 +775,7 @@ App::post('/v1/messaging/providers/apns')
   ->desc('Create APNS Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.create')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -797,6 +814,7 @@ App::patch('/v1/messaging/providers/:id/apns')
   ->desc('Update APNS Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.update')
+  ->label('audits.resource', 'providers/{response.$id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -857,6 +875,7 @@ App::delete('/v1/messaging/providers/:id')
   ->desc('Delete Provider')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'providers.delete')
+  ->label('audits.resource', 'providers/{request.id}')
   ->label('scope', 'providers.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
   ->label('sdk.namespace', 'messaging')
@@ -885,6 +904,7 @@ App::post('/v1/messaging/messages/email')
   ->desc('Send an email.')
   ->groups(['api', 'messaging'])
   ->label('audits.event', 'messages.create')
+  ->label('audits.resource', 'messages/{response.$id}')
   ->label('scope', 'messages.write')
   ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
   ->label('sdk.namespace', 'messaging')
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index d27d487ebb..df5ea7925d 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -377,7 +377,7 @@ App::post('/v1/users/:userId/targets')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].targets.[targetId].create')
     ->label('audits.event', 'targets.create')
-    ->label('audits.resource', 'user/{response.$id}')
+    ->label('audits.resource', 'user/{response.userId}')
     ->label('scope', 'targets.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'users')
@@ -1219,7 +1219,7 @@ App::patch('/v1/users/:userId/targets/:targetId/identifier')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].targets.[targetId].update')
     ->label('audits.event', 'targets.update')
-    ->label('audits.resource', 'user/{response.$id}')
+    ->label('audits.resource', 'user/{response.userId}')
     ->label('scope', 'targets.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'users')
@@ -1394,7 +1394,7 @@ App::delete('/v1/users/:userId/targets/:targetId')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].targets.[targetId].delete')
     ->label('audits.event', 'targets.delete')
-    ->label('audits.resource', 'user/{response.$id}')
+    ->label('audits.resource', 'user/{response.userId}')
     ->label('scope', 'targets.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'users')