diff --git a/next.config.ts b/next.config.ts
index d02b403..ae32f0c 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -7,18 +7,11 @@ const nextConfig: NextConfig = {
   // Image optimization
   images: {
     remotePatterns: [
-      {
-        protocol: "https",
-        hostname: "**",
-      },
-      {
-        protocol: "http",
-        hostname: "localhost",
-      },
-      {
-        protocol: "http",
-        hostname: "127.0.0.1",
-      },
+      { protocol: "https", hostname: "*.contabostorage.com" },
+      { protocol: "https", hostname: "*.amazonaws.com" },
+      { protocol: "https", hostname: "*.digitaloceanspaces.com" },
+      { protocol: "http", hostname: "localhost" },
+      { protocol: "http", hostname: "127.0.0.1" },
     ],
     // Don't proxy external images through Next.js server
     // Avoids SSL cert issues with Contabo S3 (sin1.contabostorage.com)
diff --git a/src/app/(agent)/agent/settings/password/page.tsx b/src/app/(agent)/agent/settings/password/page.tsx
index 4dcfdc9..5d0d5a6 100644
--- a/src/app/(agent)/agent/settings/password/page.tsx
+++ b/src/app/(agent)/agent/settings/password/page.tsx
@@ -3,8 +3,8 @@
 import { SettingsSidebar, PasswordSecurityForm } from '@/components/settings';
 
 export default function PasswordSecurityPage() {
-  const handleSave = (data: { currentPassword: string; newPassword: string }) => {
-    console.log('Updating agent password:', data);
+  const handleSave = (_data: { currentPassword: string; newPassword: string }) => {
+    // TODO: call the change-password API. Do not log password payloads.
   };
 
   return (
diff --git a/src/app/(user)/user/settings/password/page.tsx b/src/app/(user)/user/settings/password/page.tsx
index b2b8363..00f2c52 100644
--- a/src/app/(user)/user/settings/password/page.tsx
+++ b/src/app/(user)/user/settings/password/page.tsx
@@ -3,8 +3,8 @@
 import { SettingsSidebar, PasswordSecurityForm } from '@/components/settings';
 
 export default function UserPasswordSecurityPage() {
-  const handleSave = (data: { currentPassword: string; newPassword: string }) => {
-    console.log('Updating user password:', data);
+  const handleSave = (_data: { currentPassword: string; newPassword: string }) => {
+    // TODO: call the change-password API. Do not log password payloads.
   };
 
   return (
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 9beae7b..39a4aa9 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -31,7 +31,7 @@ interface ContactCta {
 const defaultContactDetails: ContactDetails = {
   title: 'Get In Touch',
   description: 'Have a question about a property or need assistance? Fill out the form below and our team will get back to you shortly.',
-  email: '123support@gmail.com',
+  email: 'support@re-quest.com',
   phone: '1234567890',
   phoneHours: 'Mon-Fri 9am-6pm',
   officeAddress: '123 Market Street',
diff --git a/src/app/faq/page.tsx b/src/app/faq/page.tsx
index 6449b8f..d9ec264 100644
--- a/src/app/faq/page.tsx
+++ b/src/app/faq/page.tsx
@@ -262,7 +262,7 @@ export default function FAQPage() {
                     Start Live Chat
                   </Link>
                   <a
-                    href="mailto:support@requesn.com"
+                    href="mailto:support@re-quest.com"
                     className="flex items-center justify-center gap-2 w-[174px] h-[51px] border border-[#00293d] rounded-[7px] font-fractul text-[16px] text-[#00293d] hover:bg-gray-50 transition-colors"
                   >
                     <Image
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 8f08c06..2f36cac 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -158,12 +158,15 @@ export default function RootLayout({
           <NotificationProvider />
           {children}
         </SessionProvider>
-        {/* Umami analytics — loaded after page becomes interactive */}
-        <Script
-          src="https://analytics.superlabs.co/script.js"
-          data-website-id="00e1ce31-e174-4519-8b59-63e8d4556b01"
-          strategy="afterInteractive"
-        />
+        {/* Umami analytics — set NEXT_PUBLIC_UMAMI_URL and NEXT_PUBLIC_UMAMI_WEBSITE_ID to enable */}
+        {process.env.NEXT_PUBLIC_UMAMI_URL &&
+          process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID && (
+            <Script
+              src={process.env.NEXT_PUBLIC_UMAMI_URL}
+              data-website-id={process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID}
+              strategy="afterInteractive"
+            />
+          )}
         {/* Microsoft Clarity */}
         {process.env.NEXT_PUBLIC_CLARITY_ID && (
           <Script id="ms-clarity" strategy="afterInteractive">
diff --git a/src/app/privacy-policy/page.tsx b/src/app/privacy-policy/page.tsx
index 05afd4f..fccd404 100644
--- a/src/app/privacy-policy/page.tsx
+++ b/src/app/privacy-policy/page.tsx
@@ -477,10 +477,10 @@ export default function PrivacyPolicyPage() {
               <p className="mb-1">
                 Email:{' '}
                 <a
-                  href="mailto:request.sha@gmail.com"
+                  href="mailto:support@re-quest.com"
                   className="text-[#e58625] underline hover:opacity-80"
                 >
-                  request.sha@gmail.com
+                  support@re-quest.com
                 </a>
               </p>
               <p>Address: 1975 Peralta Point, Colorado Springs, CO 80910</p>
diff --git a/src/app/terms-of-service/page.tsx b/src/app/terms-of-service/page.tsx
index 437528a..500a7ec 100644
--- a/src/app/terms-of-service/page.tsx
+++ b/src/app/terms-of-service/page.tsx
@@ -163,7 +163,7 @@ export default function TermsOfServicePage() {
             <p className="font-serif text-[15px] leading-[24px] text-[#00293d] mb-4">
               If you experience any threatening, abusive, or suspicious behavior from another user, please report the
               interaction immediately using the in-app reporting feature or by contacting us at
-              officialteam.request@gmail.com. RE-Quest will investigate reported incidents and take appropriate action,
+              support@re-quest.com. RE-Quest will investigate reported incidents and take appropriate action,
               which may include account suspension or referral to law enforcement.
             </p>
 
@@ -464,7 +464,7 @@ export default function TermsOfServicePage() {
               If you have any questions or concerns about these Terms, please contact us:
             </p>
             <p className="font-serif text-[15px] leading-[24px] text-[#00293d] mb-1">
-              <span className="font-bold">Email:</span> officialteam.request@gmail.com
+              <span className="font-bold">Email:</span> support@re-quest.com
             </p>
             <p className="font-serif text-[15px] leading-[24px] text-[#00293d]">
               <span className="font-bold">Address:</span> 1975 Peralta Point, Colorado Springs, CO 80910
diff --git a/src/components/settings/SubscriptionForm.tsx b/src/components/settings/SubscriptionForm.tsx
index b6e93de..8d41aaf 100644
--- a/src/components/settings/SubscriptionForm.tsx
+++ b/src/components/settings/SubscriptionForm.tsx
@@ -270,10 +270,10 @@ export function SubscriptionForm() {
 
           {/* Support Email */}
           <Link
-            href="mailto:support@example.com"
+            href="mailto:support@re-quest.com"
             className="font-serif font-bold text-[14px] text-[#e58625] underline hover:text-[#d47920] transition-colors"
           >
-            support@example.com
+            support@re-quest.com
           </Link>
         </div>
 
diff --git a/src/services/socket.service.ts b/src/services/socket.service.ts
index 05b3281..145650b 100644
--- a/src/services/socket.service.ts
+++ b/src/services/socket.service.ts
@@ -59,7 +59,7 @@ class SocketService {
     }
 
     // Extract base URL without /api/v1 path for Socket.io connection
-    const apiUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4000';
+    const apiUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001/api/v1';
     const baseUrl = apiUrl.replace(/\/api\/v1\/?$/, '');
 
     this.socket = io(baseUrl, {