diff --git a/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx b/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx
index a09b0ab68..51376a2b8 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx
@@ -211,7 +211,7 @@ export function OrganizationForm(props: {
           <Label>{__("Organization logo")}</Label>
           <div className="flex w-max items-center gap-4">
             <Avatar
-              className="bg-transparent"
+              className={logoPreview || organization.logoUrl ? "bg-transparent" : undefined}
               src={logoPreview || organization.logoUrl}
               name={organization.name}
               size="xl"
diff --git a/apps/console/src/pages/organizations/compliance-page/brand/CompliancePageBrandPage.tsx b/apps/console/src/pages/organizations/compliance-page/brand/CompliancePageBrandPage.tsx
index ab434b53b..499e00470 100644
--- a/apps/console/src/pages/organizations/compliance-page/brand/CompliancePageBrandPage.tsx
+++ b/apps/console/src/pages/organizations/compliance-page/brand/CompliancePageBrandPage.tsx
@@ -7,6 +7,7 @@ import {
   IconTrashCan,
   Label,
   Spinner,
+  useToast,
 } from "@probo/ui";
 import { type ChangeEventHandler, useState } from "react";
 import { type PreloadedQuery, usePreloadedQuery } from "react-relay";
@@ -46,7 +47,9 @@ const updateTrustCenterBrandMutation = graphql`
 
 export function CompliancePageBrandPage(props: { queryRef: PreloadedQuery<CompliancePageBrandPageQuery> }) {
   const { queryRef } = props;
+
   const { __ } = useTranslate();
+  const { toast } = useToast();
 
   const { organization } = usePreloadedQuery<CompliancePageBrandPageQuery>(compliancePageBrandPageQuery, queryRef);
   if (organization.__typename !== "Organization") {
@@ -81,6 +84,15 @@ export function CompliancePageBrandPage(props: { queryRef: PreloadedQuery<Compli
     const file = e.target.files?.[0];
     if (!file) return;
 
+    if (file.size > 5 * 1024 * 1024) {
+      toast({
+        title: __("File size too large"),
+        description: __("The file size is too large. Please upload a file smaller than 5MB."),
+        variant: "error",
+      });
+      return;
+    }
+
     processLogoFile(file, setLogoPreview);
 
     void updateBrand({
@@ -103,6 +115,15 @@ export function CompliancePageBrandPage(props: { queryRef: PreloadedQuery<Compli
     const file = e.target.files?.[0];
     if (!file) return;
 
+    if (file.size > 5 * 1024 * 1024) {
+      toast({
+        title: __("File size too large"),
+        description: __("The file size is too large. Please upload a file smaller than 5MB."),
+        variant: "error",
+      });
+      return;
+    }
+
     processLogoFile(file, setDarkLogoPreview);
 
     void updateBrand({
diff --git a/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx b/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx
index 972da7712..b9aea101d 100644
--- a/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx
+++ b/apps/console/src/pages/organizations/compliance-page/domain/_components/DeleteCompliancePageDomainDialog.tsx
@@ -100,7 +100,7 @@ export function DeleteCompliancePageDomainDialog(props: DeleteCompliancePageDoma
           variant="danger"
           icon={IconTrashCan}
           onClick={() => void handleDeleteDomain()}
-          disabled={isDeleting}
+          disabled={isDeleting || inputValue !== domain}
         >
           {isDeleting ? __("Deleting...") : __("Delete Domain")}
         </Button>
diff --git a/apps/trust/src/pages/auth/AuthLayout.tsx b/apps/trust/src/pages/auth/AuthLayout.tsx
index 67debdf0e..d49c0e7b5 100644
--- a/apps/trust/src/pages/auth/AuthLayout.tsx
+++ b/apps/trust/src/pages/auth/AuthLayout.tsx
@@ -39,10 +39,10 @@ export function AuthLayout(props: { queryRef: PreloadedQuery<AuthLayoutQuery> })
                 <img
                   alt=""
                   src={logoFileUrl}
-                  className="size-110 rounded-2xl"
+                  className="size-[440px] rounded-2xl"
                 />
               )
-            : <Logo withPicto className="w-110" />}
+            : <Logo withPicto className="w-[440px]" />}
         </div>
       </div>
     </div>
diff --git a/packages/emails/emails.go b/packages/emails/emails.go
index 688dabd3c..cbc3110e2 100644
--- a/packages/emails/emails.go
+++ b/packages/emails/emails.go
@@ -257,7 +257,7 @@ func (p *Presenter) RenderTrustCenterDocumentAccessRejected(
 	return fmt.Sprintf(subjectTrustCenterDocumentAccessRejected, organizationName), textBody, htmlBody, err
 }
 
-func (p *Presenter) RenderMagicLink(magicLinkUrlPath string, tokenDuration time.Duration, organizationName string) (subject string, textBody string, htmlBody *string, err error) {
+func (p *Presenter) RenderMagicLink(magicLinkUrlPath string, tokenString string, tokenDuration time.Duration, organizationName string) (subject string, textBody string, htmlBody *string, err error) {
 	data := struct {
 		PresenterVariables
 		MagicLinkURL      string
@@ -265,7 +265,7 @@ func (p *Presenter) RenderMagicLink(magicLinkUrlPath string, tokenDuration time.
 		OrganizationName  string
 	}{
 		PresenterVariables: p.variables,
-		MagicLinkURL:       baseurl.MustParse(p.variables.BaseURL).WithPath(magicLinkUrlPath).MustString(),
+		MagicLinkURL:       baseurl.MustParse(p.variables.BaseURL).WithPath(magicLinkUrlPath).WithQuery("token", tokenString).MustString(),
 		DurationInMinutes:  int(tokenDuration.Minutes()),
 		OrganizationName:   organizationName,
 	}
diff --git a/packages/emails/src/components/Logo.tsx b/packages/emails/src/components/Logo.tsx
index 23d646f4b..767f06590 100644
--- a/packages/emails/src/components/Logo.tsx
+++ b/packages/emails/src/components/Logo.tsx
@@ -4,7 +4,7 @@ import * as React from 'react';
 export function Logo() {
   return (
     <Img
-      className="max-width-[220px]"
+      style={{ maxWidth: "220px" }}
       src="{{.SenderCompanyLogoURL}}"
       alt="{{.SenderCompanyName}}"
       height="60"
diff --git a/packages/emails/templates/confirm-email.txt b/packages/emails/templates/confirm-email.txt
index 22f406bf4..fffbf38d2 100644
--- a/packages/emails/templates/confirm-email.txt
+++ b/packages/emails/templates/confirm-email.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 Thanks for joining Probo! Please confirm your email address by clicking the link below:
 
diff --git a/packages/emails/templates/document-export.txt b/packages/emails/templates/document-export.txt
index 76ec9b5ca..cec4207bf 100644
--- a/packages/emails/templates/document-export.txt
+++ b/packages/emails/templates/document-export.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 Your document export has been completed successfully. Click the link below to download it:
 
diff --git a/packages/emails/templates/document-signing.txt b/packages/emails/templates/document-signing.txt
index 8145aa013..317d7b238 100644
--- a/packages/emails/templates/document-signing.txt
+++ b/packages/emails/templates/document-signing.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 You're receiving this message because your company, {{.OrganizationName}}, has shared a new compliance document that requires your review and signature.
 
diff --git a/packages/emails/templates/framework-export.txt b/packages/emails/templates/framework-export.txt
index 7ae729502..2d50fa6e4 100644
--- a/packages/emails/templates/framework-export.txt
+++ b/packages/emails/templates/framework-export.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 Your framework export has been completed successfully. Click the link below to download it:
 
diff --git a/packages/emails/templates/invitation.txt b/packages/emails/templates/invitation.txt
index 79b2c06d5..f64083423 100644
--- a/packages/emails/templates/invitation.txt
+++ b/packages/emails/templates/invitation.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 You have been invited to join organization {{.OrganizationName}} on Probo. Click the link below to accept the invitation:
 
diff --git a/packages/emails/templates/magic-link.txt b/packages/emails/templates/magic-link.txt
index f55d29df1..fbef7acba 100644
--- a/packages/emails/templates/magic-link.txt
+++ b/packages/emails/templates/magic-link.txt
@@ -1,8 +1,8 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
-Please use this link to connect to Probo:
+Please use this link to connect to {{.OrganizationName}}'s Compliance Page:
 
 {{.MagicLinkURL}}
 
diff --git a/packages/emails/templates/password-reset.txt b/packages/emails/templates/password-reset.txt
index b8aebde12..de3bdbc94 100644
--- a/packages/emails/templates/password-reset.txt
+++ b/packages/emails/templates/password-reset.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 You have requested a password reset for your Probo account. Click the link below to reset your password:
 
diff --git a/packages/emails/templates/trust-center-access.txt b/packages/emails/templates/trust-center-access.txt
index 3beb6deb3..e459d457e 100644
--- a/packages/emails/templates/trust-center-access.txt
+++ b/packages/emails/templates/trust-center-access.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 You have been granted access to {{.OrganizationName}}'s compliance page! Click the link below to access it:
 
diff --git a/packages/emails/templates/trust-center-document-access-rejected.txt b/packages/emails/templates/trust-center-document-access-rejected.txt
index 3d5ca94bd..45d767909 100644
--- a/packages/emails/templates/trust-center-document-access-rejected.txt
+++ b/packages/emails/templates/trust-center-document-access-rejected.txt
@@ -1,6 +1,6 @@
 Probo
 
-Hi {{.FullName}},
+Hi {{.RecipientFullName}},
 
 Your access request to the following files in {{.OrganizationName}}'s compliance page has been rejected:
 
diff --git a/pkg/iam/auth_service.go b/pkg/iam/auth_service.go
index 5200e42a3..8d2773ee6 100644
--- a/pkg/iam/auth_service.go
+++ b/pkg/iam/auth_service.go
@@ -582,6 +582,7 @@ func (s AuthService) SendMagicLink(ctx context.Context, req *SendMagicLinkReques
 
 			subject, textBody, htmlBody, err := emailPresenter.RenderMagicLink(
 				req.URLPath,
+				tokenString,
 				s.magicLinkTokenValidity,
 				organization.Name,
 			)
diff --git a/pkg/iam/compliance_page_service.go b/pkg/iam/compliance_page_service.go
index d700c4c84..8c533aaf2 100644
--- a/pkg/iam/compliance_page_service.go
+++ b/pkg/iam/compliance_page_service.go
@@ -153,7 +153,7 @@ func (s *CompliancePageService) EmailPresenterConfig(ctx context.Context, compli
 
 		// If logo exists, then we will brand the emails with the org as a sender
 
-		presignedURL, err := s.fm.GenerateFileUrl(ctx, logoFile, 1*time.Hour)
+		presignedURL, err := s.fm.GenerateFileUrl(ctx, logoFile, 7*24*time.Hour)
 		if err != nil {
 			return emailPresenterCfg, fmt.Errorf("cannot generate file URL: %w", err)
 		}
diff --git a/pkg/iam/organization_service.go b/pkg/iam/organization_service.go
index 765628e92..5f7789bdf 100644
--- a/pkg/iam/organization_service.go
+++ b/pkg/iam/organization_service.go
@@ -593,8 +593,8 @@ func (s *OrganizationService) CreateOrganization(
 		var (
 			fileID      = gid.New(tenantID, coredata.FileEntityType)
 			objectKey   = uuid.MustNewV7()
-			filename    = req.LogoFile.Filename
-			contentType = req.LogoFile.ContentType
+			filename    = req.HorizontalLogoFile.Filename
+			contentType = req.HorizontalLogoFile.ContentType
 			now         = time.Now()
 		)
 
@@ -604,7 +604,7 @@ func (s *OrganizationService) CreateOrganization(
 			MimeType:   contentType,
 			FileName:   filename,
 			FileKey:    objectKey.String(),
-			FileSize:   req.LogoFile.Size,
+			FileSize:   req.HorizontalLogoFile.Size,
 			CreatedAt:  now,
 			UpdatedAt:  now,
 		}
diff --git a/pkg/probo/trust_center_service.go b/pkg/probo/trust_center_service.go
index 3501f751a..11d304423 100644
--- a/pkg/probo/trust_center_service.go
+++ b/pkg/probo/trust_center_service.go
@@ -420,14 +420,15 @@ func (s TrustCenterService) uploadFile(
 	fileID := gid.New(s.svc.scope.GetTenantID(), coredata.FileEntityType)
 
 	file := &coredata.File{
-		ID:         fileID,
-		BucketName: s.svc.bucket,
-		MimeType:   mimeType,
-		FileName:   fileUpload.Filename,
-		FileKey:    objectKey.String(),
-		FileSize:   *headOutput.ContentLength,
-		CreatedAt:  now,
-		UpdatedAt:  now,
+		ID:             fileID,
+		OrganizationID: trustCenter.OrganizationID,
+		BucketName:     s.svc.bucket,
+		MimeType:       mimeType,
+		FileName:       fileUpload.Filename,
+		FileKey:        objectKey.String(),
+		FileSize:       *headOutput.ContentLength,
+		CreatedAt:      now,
+		UpdatedAt:      now,
 	}
 
 	if err := file.Insert(ctx, conn, s.svc.scope); err != nil {
@@ -638,7 +639,7 @@ func (s *TrustCenterService) EmailPresenterConfig(ctx context.Context, complianc
 			return emailPresenterCfg, nil
 		}
 
-		presignedURL, err := s.svc.fileManager.GenerateFileUrl(ctx, logoFile, 1*time.Hour)
+		presignedURL, err := s.svc.fileManager.GenerateFileUrl(ctx, logoFile, 7*24*time.Hour)
 		if err != nil {
 			return emailPresenterCfg, fmt.Errorf("cannot generate file URL: %w", err)
 		}
diff --git a/pkg/trust/trust_center_service.go b/pkg/trust/trust_center_service.go
index 68a6dcebc..16efbd65b 100644
--- a/pkg/trust/trust_center_service.go
+++ b/pkg/trust/trust_center_service.go
@@ -288,7 +288,7 @@ func (s *TrustCenterService) EmailPresenterConfig(ctx context.Context, complianc
 
 		// If logo exists, then we will brand the emails with the org as a sender
 
-		presignedURL, err := s.svc.fileManager.GenerateFileUrl(ctx, logoFile, 1*time.Hour)
+		presignedURL, err := s.svc.fileManager.GenerateFileUrl(ctx, logoFile, 7*24*time.Hour)
 		if err != nil {
 			return emailPresenterCfg, fmt.Errorf("cannot generate file URL: %w", err)
 		}