diff --git a/src/trx-client/src/config.rs b/src/trx-client/src/config.rs
index d475708..cc54b2e 100644
--- a/src/trx-client/src/config.rs
+++ b/src/trx-client/src/config.rs
@@ -143,23 +143,18 @@ impl Default for AudioBridgeConfig {
 }
 
 /// Cookie SameSite attribute options.
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, Default)]
 #[serde(rename_all = "PascalCase")]
 pub enum CookieSameSite {
     /// Strict: cookie only sent in same-site context
     Strict,
     /// Lax: cookie sent with top-level navigation (default)
+    #[default]
     Lax,
     /// None: cookie sent in all contexts (requires Secure=true)
     None,
 }
 
-impl Default for CookieSameSite {
-    fn default() -> Self {
-        Self::Lax
-    }
-}
-
 impl AsRef<str> for CookieSameSite {
     fn as_ref(&self) -> &str {
         match self {
diff --git a/src/trx-client/trx-frontend/trx-frontend-http/src/auth.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/auth.rs
index a04cec9..2d09980 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/src/auth.rs
+++ b/src/trx-client/trx-frontend/trx-frontend-http/src/auth.rs
@@ -132,9 +132,10 @@ impl Default for SessionStore {
 }
 
 /// Cookie SameSite attribute
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum SameSite {
     Strict,
+    #[default]
     Lax,
     None,
 }
@@ -149,12 +150,6 @@ impl SameSite {
     }
 }
 
-impl Default for SameSite {
-    fn default() -> Self {
-        Self::Lax
-    }
-}
-
 /// Runtime authentication configuration
 #[derive(Debug, Clone)]
 pub struct AuthConfig {
@@ -260,7 +255,7 @@ pub struct LoginResponse {
 /// Extract session from cookie
 fn extract_session_id(req: &HttpRequest) -> Option<SessionId> {
     req.cookie("trx_http_sid")
-        .and_then(|cookie| Some(cookie.value().to_string()))
+        .map(|cookie| cookie.value().to_string())
 }
 
 /// Get session from request, return role if valid