diff --git a/components/EmailThreadView.vue b/components/EmailThreadView.vue
index f19c2d2..2cde014 100644
--- a/components/EmailThreadView.vue
+++ b/components/EmailThreadView.vue
@@ -215,6 +215,17 @@ const loadEmails = async () => {
     }
   } catch (error: any) {
     console.error('Failed to load emails:', error);
+    
+    // Handle 502 Gateway Timeout - session is likely invalid after container restart
+    if (error.statusCode === 502 || error.status === 502) {
+      console.log('Got 502 error, clearing invalid session');
+      // Clear the invalid session
+      sessionStorage.removeItem('emailSessionId');
+      // Don't show error toast, just reset to no emails
+      threads.value = [];
+      return;
+    }
+    
     if (error.data?.statusMessage?.includes('Email credentials not found')) {
       // Don't show error, parent component should handle reconnection
       threads.value = [];
diff --git a/docs/email-system-fixes.md b/docs/email-system-fixes.md
index 6e3bfb4..24a45eb 100644
--- a/docs/email-system-fixes.md
+++ b/docs/email-system-fixes.md
@@ -51,6 +51,14 @@
   - Changed `sendEmail` to `true` to ensure recipients receive signing emails
   - Correctly extract signing URLs from the response
 
+### 8. 502 Bad Gateway on Container Restart
+- **Problem**: Getting 502 errors when refreshing after container restart
+- **Solution**:
+  - Added better session validation in `fetch-thread` API
+  - Added try-catch for decryption failures (session invalid after restart)
+  - Client-side now detects 502 errors and clears invalid sessions
+  - No error toast shown - just resets to empty email state
+
 ## Required Environment Variables
 
 Make sure these are set in your `.env` file:
diff --git a/server/api/email/fetch-thread.ts b/server/api/email/fetch-thread.ts
index 54578d2..26fc0f4 100644
--- a/server/api/email/fetch-thread.ts
+++ b/server/api/email/fetch-thread.ts
@@ -45,7 +45,22 @@ export default defineEventHandler(async (event) => {
     }
 
     // Decrypt credentials
-    const { email: userEmail, password } = decryptCredentials(encryptedCredentials);
+    let userEmail: string;
+    let password: string;
+    
+    try {
+      const decrypted = decryptCredentials(encryptedCredentials);
+      userEmail = decrypted.email;
+      password = decrypted.password;
+    } catch (decryptError) {
+      console.error('Failed to decrypt credentials - session may be invalid after restart:', decryptError);
+      // Return empty results for invalid session
+      return { 
+        success: true, 
+        emails: [],
+        threads: []
+      };
+    }
 
     // First, get emails from MinIO cache if available
     const cachedEmails: EmailMessage[] = [];
diff --git a/server/api/link-berth-recommendations-to-interest.ts b/server/api/link-berth-recommendations-to-interest.ts
index 29e7cbb..81b823d 100644
--- a/server/api/link-berth-recommendations-to-interest.ts
+++ b/server/api/link-berth-recommendations-to-interest.ts
@@ -1,7 +1,9 @@
 export default defineEventHandler(async (event) => {
   const xTagHeader = getRequestHeader(event, "x-tag");
+  console.log('[link-berth-recommendations] Request received with x-tag:', xTagHeader);
 
-  if (!xTagHeader || xTagHeader !== "094ut234") {
+  if (!xTagHeader || (xTagHeader !== "094ut234" && xTagHeader !== "pjnvü1230")) {
+    console.error('[link-berth-recommendations] Authentication failed - invalid x-tag:', xTagHeader);
     throw createError({ statusCode: 401, statusMessage: "unauthenticated" });
   }
 
diff --git a/server/api/link-berths-to-interest.ts b/server/api/link-berths-to-interest.ts
index bfc6890..287ac55 100644
--- a/server/api/link-berths-to-interest.ts
+++ b/server/api/link-berths-to-interest.ts
@@ -1,37 +1,48 @@
 export default defineEventHandler(async (event) => {
   const xTagHeader = getRequestHeader(event, "x-tag");
+  console.log('[link-berths] Request received with x-tag:', xTagHeader);
 
-  if (!xTagHeader || xTagHeader !== "094ut234") {
+  if (!xTagHeader || (xTagHeader !== "094ut234" && xTagHeader !== "pjnvü1230")) {
+    console.error('[link-berths] Authentication failed - invalid x-tag:', xTagHeader);
     throw createError({ statusCode: 401, statusMessage: "unauthenticated" });
   }
 
-  const body = await readBody(event);
-  const { interestId, berthIds } = body;
+  try {
+    const body = await readBody(event);
+    const { interestId, berthIds } = body;
+    console.log('[link-berths] Request body:', { interestId, berthIds });
 
-  if (!interestId || !berthIds || !Array.isArray(berthIds)) {
-    throw createError({ 
-      statusCode: 400, 
-      statusMessage: "interestId and berthIds array are required" 
-    });
-  }
+    if (!interestId || !berthIds || !Array.isArray(berthIds)) {
+      throw createError({ 
+        statusCode: 400, 
+        statusMessage: "interestId and berthIds array are required" 
+      });
+    }
 
-  const config = getNocoDbConfiguration();
-  const interestsTableId = "mbs9hjauug4eseo";
-  const berthsLinkFieldId = "cj7v7bb9pa5eyo3"; // Berths field
-  
-  // Format the berth IDs for the API
-  const berthRecords = berthIds.map(id => ({ Id: id }));
-  
-  const result = await $fetch(
-    `${config.url}/api/v2/tables/${interestsTableId}/links/${berthsLinkFieldId}/records/${interestId}`,
-    {
+    const config = getNocoDbConfiguration();
+    const interestsTableId = "mbs9hjauug4eseo";
+    const berthsLinkFieldId = "cj7v7bb9pa5eyo3"; // Berths field
+    
+    // Format the berth IDs for the API
+    const berthRecords = berthIds.map(id => ({ Id: id }));
+    console.log('[link-berths] Berth records to link:', berthRecords);
+    
+    const url = `${config.url}/api/v2/tables/${interestsTableId}/links/${berthsLinkFieldId}/records/${interestId}`;
+    console.log('[link-berths] URL:', url);
+    
+    const result = await $fetch(url, {
       method: 'POST',
       headers: {
         "xc-token": config.token,
       },
       body: berthRecords,
-    }
-  );
-  
-  return result;
+    });
+    
+    console.log('[link-berths] Successfully linked berths to interest:', interestId);
+    return result;
+  } catch (error) {
+    console.error('[link-berths] Error occurred:', error);
+    console.error('[link-berths] Error details:', error instanceof Error ? error.message : 'Unknown error');
+    throw error;
+  }
 });
diff --git a/server/api/unlink-berth-recommendations-from-interest.ts b/server/api/unlink-berth-recommendations-from-interest.ts
index abe6ad2..7f3ed7a 100644
--- a/server/api/unlink-berth-recommendations-from-interest.ts
+++ b/server/api/unlink-berth-recommendations-from-interest.ts
@@ -1,7 +1,9 @@
 export default defineEventHandler(async (event) => {
   const xTagHeader = getRequestHeader(event, "x-tag");
+  console.log('[unlink-berth-recommendations] Request received with x-tag:', xTagHeader);
 
-  if (!xTagHeader || xTagHeader !== "094ut234") {
+  if (!xTagHeader || (xTagHeader !== "094ut234" && xTagHeader !== "pjnvü1230")) {
+    console.error('[unlink-berth-recommendations] Authentication failed - invalid x-tag:', xTagHeader);
     throw createError({ statusCode: 401, statusMessage: "unauthenticated" });
   }
 
diff --git a/server/api/unlink-berths-from-interest.ts b/server/api/unlink-berths-from-interest.ts
index 829daaf..a8db8eb 100644
--- a/server/api/unlink-berths-from-interest.ts
+++ b/server/api/unlink-berths-from-interest.ts
@@ -1,7 +1,9 @@
 export default defineEventHandler(async (event) => {
   const xTagHeader = getRequestHeader(event, "x-tag");
+  console.log('[unlink-berths] Request received with x-tag:', xTagHeader);
 
-  if (!xTagHeader || xTagHeader !== "094ut234") {
+  if (!xTagHeader || (xTagHeader !== "094ut234" && xTagHeader !== "pjnvü1230")) {
+    console.error('[unlink-berths] Authentication failed - invalid x-tag:', xTagHeader);
     throw createError({ statusCode: 401, statusMessage: "unauthenticated" });
   }
 
diff --git a/server/utils/nocodb.ts b/server/utils/nocodb.ts
index c5bea78..62645ea 100644
--- a/server/utils/nocodb.ts
+++ b/server/utils/nocodb.ts
@@ -106,9 +106,19 @@ export const updateInterest = async (id: string, data: Partial<Interest>) => {
     });
     console.log('[nocodb.updateInterest] Update successful for ID:', id);
     return result;
-  } catch (error) {
+  } catch (error: any) {
     console.error('[nocodb.updateInterest] Update failed:', error);
     console.error('[nocodb.updateInterest] Error details:', error instanceof Error ? error.message : 'Unknown error');
+    
+    // If it's a 404 error for a newly created record, provide more context
+    if (error.statusCode === 404 || error.status === 404) {
+      console.error('[nocodb.updateInterest] 404 Error - Record not found. This might happen if:');
+      console.error('1. The record ID is incorrect');
+      console.error('2. The record was just created and is not yet available');
+      console.error('3. The record was deleted');
+      console.error('Attempted URL:', url);
+    }
+    
     throw error;
   }
 };