diff --git a/crates/core/database/src/util/reference.rs b/crates/core/database/src/util/reference.rs
index 4fef453d..05309459 100644
--- a/crates/core/database/src/util/reference.rs
+++ b/crates/core/database/src/util/reference.rs
@@ -134,7 +134,7 @@ impl<'a> JsonSchema for Reference<'a> {
 }
 
 #[cfg(feature = "rocket-impl")]
-impl<'r> FromFormField<'r> for Reference {
+impl<'r> FromFormField<'r> for Reference<'r> {
     fn from_value(field: rocket::form::ValueField<'r>) -> rocket::form::Result<'r, Self> {
         Ok(Reference::from_unchecked(field.value.into()))
     }
diff --git a/crates/core/models/src/v0/server_members.rs b/crates/core/models/src/v0/server_members.rs
index 94b7331e..b862af3b 100644
--- a/crates/core/models/src/v0/server_members.rs
+++ b/crates/core/models/src/v0/server_members.rs
@@ -157,9 +157,4 @@ auto_derived!(
         pub user: crate::v0::User,
         pub member: Member,
     }
-
-    pub struct MemberWithUserResponse {
-        pub user: crate::v0::User,
-        pub member: Member,
-    }
 );
diff --git a/crates/delta/src/routes/admin/comments/comment_edit.rs b/crates/delta/src/routes/admin/comments/comment_edit.rs
index b6027e36..8089d15e 100644
--- a/crates/delta/src/routes/admin/comments/comment_edit.rs
+++ b/crates/delta/src/routes/admin/comments/comment_edit.rs
@@ -17,7 +17,7 @@ use crate::routes::admin::util::{
 pub async fn admin_comment_edit(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     body: Json<v0::AdminCommentEdit>,
 ) -> Result<EmptyResponse> {
     let user = flatten_authorized_user(&auth);
diff --git a/crates/delta/src/routes/admin/comments/comment_fetch_case.rs b/crates/delta/src/routes/admin/comments/comment_fetch_case.rs
index aeb80474..2e7e9d2a 100644
--- a/crates/delta/src/routes/admin/comments/comment_fetch_case.rs
+++ b/crates/delta/src/routes/admin/comments/comment_fetch_case.rs
@@ -13,7 +13,7 @@ use crate::routes::admin::util::{
 pub async fn admin_comment_fetch_case(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
 ) -> Result<Json<Vec<v0::AdminComment>>> {
     let user = flatten_authorized_user(&auth);
     if !user_has_permission(user, v0::AdminUserPermissionFlags::Comments) {
diff --git a/crates/delta/src/routes/admin/comments/comment_fetch_object.rs b/crates/delta/src/routes/admin/comments/comment_fetch_object.rs
index 3fdd3057..3a936704 100644
--- a/crates/delta/src/routes/admin/comments/comment_fetch_object.rs
+++ b/crates/delta/src/routes/admin/comments/comment_fetch_object.rs
@@ -13,7 +13,7 @@ use crate::routes::admin::util::{
 pub async fn admin_comment_fetch_object(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
 ) -> Result<Json<Vec<v0::AdminComment>>> {
     let user = flatten_authorized_user(&auth);
     if !user_has_permission(user, v0::AdminUserPermissionFlags::Comments) {
diff --git a/crates/delta/src/routes/admin/meta/edit_user.rs b/crates/delta/src/routes/admin/meta/edit_user.rs
index 68b982e5..4b89220d 100644
--- a/crates/delta/src/routes/admin/meta/edit_user.rs
+++ b/crates/delta/src/routes/admin/meta/edit_user.rs
@@ -12,7 +12,7 @@ use crate::routes::admin::util::{flatten_authorized_user, user_has_permission};
 pub async fn admin_edit_user(
     db: &State<Database>,
     auth: AdminAuthorization,
-    target: Reference,
+    target: Reference<'_>,
     body: Json<v0::AdminUserEdit>,
 ) -> Result<EmptyResponse> {
     let user = flatten_authorized_user(&auth);
diff --git a/crates/delta/src/routes/admin/meta/revoke_token.rs b/crates/delta/src/routes/admin/meta/revoke_token.rs
index 4c0bea9c..70cf17b5 100644
--- a/crates/delta/src/routes/admin/meta/revoke_token.rs
+++ b/crates/delta/src/routes/admin/meta/revoke_token.rs
@@ -13,7 +13,7 @@ use crate::routes::admin::util::user_has_permission;
 pub async fn admin_revoke_token(
     db: &State<Database>,
     auth: AdminMachineToken,
-    token: Reference,
+    token: Reference<'_>,
 ) -> Result<EmptyResponse> {
     if !user_has_permission(
         &auth.on_behalf_of,
diff --git a/crates/delta/src/routes/admin/servers/actions/server_add_members.rs b/crates/delta/src/routes/admin/servers/actions/server_add_members.rs
index 86bfde23..7d9186ba 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_add_members.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_add_members.rs
@@ -15,9 +15,9 @@ use crate::routes::admin::util::{
 pub async fn admin_server_add_member(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
-    user_id: Reference,
+    user_id: Reference<'_>,
     suppress_alerts: bool,
 ) -> Result<Json<v0::MemberWithUserResponse>> {
     let user = flatten_authorized_user(&auth);
diff --git a/crates/delta/src/routes/admin/servers/actions/server_ban_members.rs b/crates/delta/src/routes/admin/servers/actions/server_ban_members.rs
index 8ed09526..b14c46bb 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_ban_members.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_ban_members.rs
@@ -19,9 +19,9 @@ use crate::routes::admin::util::{
 pub async fn admin_server_ban_member(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
-    user_id: Reference,
+    user_id: Reference<'_>,
     suppress_alerts: bool,
     body: Json<v0::DataBanCreate>,
 ) -> Result<Json<v0::ServerBan>> {
diff --git a/crates/delta/src/routes/admin/servers/actions/server_change_owner.rs b/crates/delta/src/routes/admin/servers/actions/server_change_owner.rs
index dcb9da4c..c71f584e 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_change_owner.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_change_owner.rs
@@ -16,9 +16,9 @@ use crate::routes::admin::util::{
 pub async fn admin_server_change_owner(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
-    user_id: Reference,
+    user_id: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let user = flatten_authorized_user(&auth);
     if !user_has_permission(user, v0::AdminUserPermissionFlags::ManageServers) {
diff --git a/crates/delta/src/routes/admin/servers/actions/server_create_invite.rs b/crates/delta/src/routes/admin/servers/actions/server_create_invite.rs
index f6d734a1..af9643e0 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_create_invite.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_create_invite.rs
@@ -15,8 +15,8 @@ use crate::routes::admin::util::{
 pub async fn admin_server_create_invite(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
-    channel_id: Reference,
+    id: Reference<'_>,
+    channel_id: Reference<'_>,
     case: Option<&str>,
     slug: Option<&str>,
 ) -> Result<Json<v0::Invite>> {
diff --git a/crates/delta/src/routes/admin/servers/actions/server_delete.rs b/crates/delta/src/routes/admin/servers/actions/server_delete.rs
index 022c2b36..d64350b5 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_delete.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_delete.rs
@@ -15,7 +15,7 @@ use crate::routes::admin::util::{
 pub async fn admin_server_delete(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
 ) -> Result<EmptyResponse> {
     let user = flatten_authorized_user(&auth);
diff --git a/crates/delta/src/routes/admin/servers/actions/server_delete_invites.rs b/crates/delta/src/routes/admin/servers/actions/server_delete_invites.rs
index a5838c01..44a763ac 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_delete_invites.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_delete_invites.rs
@@ -16,9 +16,9 @@ use crate::routes::admin::util::{
 pub async fn admin_server_delete_invites(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
-    slug: Option<Reference>,
+    slug: Option<Reference<'_>>,
 ) -> Result<EmptyResponse> {
     let user = flatten_authorized_user(&auth);
     if !user_has_permission(user, v0::AdminUserPermissionFlags::ManageServers) {
diff --git a/crates/delta/src/routes/admin/servers/actions/server_edit.rs b/crates/delta/src/routes/admin/servers/actions/server_edit.rs
index 0e1f465f..2b56c51e 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_edit.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_edit.rs
@@ -16,7 +16,7 @@ use crate::routes::admin::util::{
 pub async fn admin_server_edit(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
     body: Json<v0::DataEditServer>,
 ) -> Result<Json<v0::Server>> {
diff --git a/crates/delta/src/routes/admin/servers/actions/server_remove_members.rs b/crates/delta/src/routes/admin/servers/actions/server_remove_members.rs
index c17779aa..3ff9800f 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_remove_members.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_remove_members.rs
@@ -16,9 +16,9 @@ use crate::routes::admin::util::{
 pub async fn admin_server_remove_members(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
-    user_id: Vec<Reference>,
+    user_id: Vec<Reference<'_>>,
     suppress_alerts: bool,
 ) -> Result<EmptyResponse> {
     let admin_user = flatten_authorized_user(&auth);
diff --git a/crates/delta/src/routes/admin/servers/actions/server_unban_members.rs b/crates/delta/src/routes/admin/servers/actions/server_unban_members.rs
index 622a0194..d3664654 100644
--- a/crates/delta/src/routes/admin/servers/actions/server_unban_members.rs
+++ b/crates/delta/src/routes/admin/servers/actions/server_unban_members.rs
@@ -18,9 +18,9 @@ use crate::routes::admin::util::{
 pub async fn admin_server_unban_member(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
-    user_id: Reference,
+    user_id: Reference<'_>,
     suppress_alerts: bool,
     body: Json<v0::DataBanCreate>,
 ) -> Result<EmptyResponse> {
diff --git a/crates/delta/src/routes/admin/servers/fetch/server_get.rs b/crates/delta/src/routes/admin/servers/fetch/server_get.rs
index 5794a487..05083385 100644
--- a/crates/delta/src/routes/admin/servers/fetch/server_get.rs
+++ b/crates/delta/src/routes/admin/servers/fetch/server_get.rs
@@ -14,7 +14,7 @@ use crate::routes::admin::util::{
 pub async fn admin_server_get(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
 ) -> Result<Json<v0::AdminServerResponse>> {
     let user = flatten_authorized_user(&auth);
diff --git a/crates/delta/src/routes/admin/servers/fetch/server_get_all_members.rs b/crates/delta/src/routes/admin/servers/fetch/server_get_all_members.rs
index 75881f69..53344afa 100644
--- a/crates/delta/src/routes/admin/servers/fetch/server_get_all_members.rs
+++ b/crates/delta/src/routes/admin/servers/fetch/server_get_all_members.rs
@@ -16,7 +16,7 @@ use crate::routes::admin::util::{
 pub async fn admin_server_get_members(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
     after: Option<usize>,
 ) -> Result<Json<v0::AdminMemberWithUserAndOffsetResponse>> {
diff --git a/crates/delta/src/routes/admin/servers/fetch/server_get_participants.rs b/crates/delta/src/routes/admin/servers/fetch/server_get_participants.rs
index bcd43a37..549ce4fb 100644
--- a/crates/delta/src/routes/admin/servers/fetch/server_get_participants.rs
+++ b/crates/delta/src/routes/admin/servers/fetch/server_get_participants.rs
@@ -15,7 +15,7 @@ use crate::routes::admin::util::{
 pub async fn admin_server_get_participants(
     db: &State<Database>,
     auth: AdminAuthorization,
-    id: Reference,
+    id: Reference<'_>,
     case: Option<&str>,
 ) -> Result<Json<Vec<(v0::User, Option<v0::Member>)>>> {
     let user = flatten_authorized_user(&auth);
diff --git a/crates/delta/src/routes/channels/message_pin.rs b/crates/delta/src/routes/channels/message_pin.rs
index bcc97341..2ef9b87c 100644
--- a/crates/delta/src/routes/channels/message_pin.rs
+++ b/crates/delta/src/routes/channels/message_pin.rs
@@ -96,7 +96,7 @@ mod test {
         .await
         .expect("Failed to create test server");
 
-        let (member, channels) = Member::create(&harness.db, &server, &user, Some(channels))
+        let (member, channels) = Member::create(&harness.db, &server, &user, Some(channels), false)
             .await
             .expect("Failed to create member");
         let channel = &channels[0];
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index 51dd5713..2ef2463e 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -238,7 +238,7 @@ mod test {
             .await
             .expect("Failed to update the channel permissions for special role");
 
-        Member::create(&harness.db, &server, &user, Some(channels.clone()))
+        Member::create(&harness.db, &server, &user, Some(channels.clone()), false)
             .await
             .expect("Failed to create member");
         let member = Reference::from_unchecked(&user.id)
@@ -278,9 +278,15 @@ mod test {
             "Mention failed to be scrubbed when the user is not part of the server"
         );
 
-        Member::create(&harness.db, &server, &second_user, Some(channels.clone()))
-            .await
-            .expect("Failed to create second member");
+        Member::create(
+            &harness.db,
+            &server,
+            &second_user,
+            Some(channels.clone()),
+            false,
+        )
+        .await
+        .expect("Failed to create second member");
         let mut second_member = Reference::from_unchecked(&second_user.id)
             .as_member(&harness.db, &server.id)
             .await
@@ -544,7 +550,7 @@ mod test {
                 }),
             )
             .await;
-        let (mut other_member, _) = Member::create(&harness.db, &server, &other_user, None)
+        let (mut other_member, _) = Member::create(&harness.db, &server, &other_user, None, false)
             .await
             .expect("Failed to add test member");
 
diff --git a/crates/delta/src/routes/channels/message_unpin.rs b/crates/delta/src/routes/channels/message_unpin.rs
index 42184895..667f4e1a 100644
--- a/crates/delta/src/routes/channels/message_unpin.rs
+++ b/crates/delta/src/routes/channels/message_unpin.rs
@@ -91,7 +91,7 @@ mod test {
 
         let channel = &channels[0];
 
-        Member::create(&harness.db, &server, &user, Some(channels.clone()))
+        Member::create(&harness.db, &server, &user, Some(channels.clone()), false)
             .await
             .expect("Failed to create member");
         let member = Reference::from_unchecked(&user.id)