diff --git a/apps/api/plane/authentication/adapter/base.py b/apps/api/plane/authentication/adapter/base.py
index 112570d56f3..3a616a21c38 100644
--- a/apps/api/plane/authentication/adapter/base.py
+++ b/apps/api/plane/authentication/adapter/base.py
@@ -78,7 +78,7 @@ def sanitize_email(self, email):
         try:
             validate_email(email)
         except ValidationError:
-            self.logger.warning(f"Email is not valid: {email}")
+            self.logger.warning("Email is not valid")
             raise AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES["INVALID_EMAIL"],
                 error_message="INVALID_EMAIL",
diff --git a/apps/api/plane/authentication/adapter/oauth.py b/apps/api/plane/authentication/adapter/oauth.py
index 0bef76b2487..afb1a31325d 100644
--- a/apps/api/plane/authentication/adapter/oauth.py
+++ b/apps/api/plane/authentication/adapter/oauth.py
@@ -90,12 +90,8 @@ def get_user_response(self):
             response.raise_for_status()
             return response.json()
         except requests.RequestException:
-            self.logger.warning(
-                "Error getting user response",
-                extra={
-                    "headers": headers,
-                },
-            )
+            # Do not log headers here: they carry the access token
+            self.logger.warning("Error getting user response")
             code = self.authentication_error_code()
             raise AuthenticationException(error_code=AUTHENTICATION_ERROR_CODES[code], error_message=str(code))
 
diff --git a/apps/api/plane/authentication/provider/oauth/github.py b/apps/api/plane/authentication/provider/oauth/github.py
index 852d8d0f66f..7b3f6a9e1e2 100644
--- a/apps/api/plane/authentication/provider/oauth/github.py
+++ b/apps/api/plane/authentication/provider/oauth/github.py
@@ -156,13 +156,9 @@ def set_user_data(self):
 
         if self.organization_id:
             if not self.is_user_in_organization(user_info_response.get("login")):
-                self.logger.warning(
-                    "User is not in organization",
-                    extra={
-                        "organization_id": self.organization_id,
-                        "user_login": user_info_response.get("login"),
-                    },
-                )
+                # Do not log the organization id or user login here:
+                # the configuration values must not end up in logs
+                self.logger.warning("User is not in organization")
                 raise AuthenticationException(
                     error_code=AUTHENTICATION_ERROR_CODES["GITHUB_USER_NOT_IN_ORG"],
                     error_message="GITHUB_USER_NOT_IN_ORG",
diff --git a/packages/editor/src/core/extensions/custom-link/extension.tsx b/packages/editor/src/core/extensions/custom-link/extension.tsx
index 0b102264258..248f3ac47a4 100644
Binary files a/packages/editor/src/core/extensions/custom-link/extension.tsx and b/packages/editor/src/core/extensions/custom-link/extension.tsx differ