diff --git a/docker-compose.encryptid.yml b/docker-compose.encryptid.yml
index aa94164..e66ccd6 100644
--- a/docker-compose.encryptid.yml
+++ b/docker-compose.encryptid.yml
@@ -16,11 +16,11 @@ services:
       - PORT=3000
       - JWT_SECRET=${JWT_SECRET}
       - DATABASE_URL=postgres://encryptid:${ENCRYPTID_DB_PASSWORD}@encryptid-db:5432/encryptid
-      - SMTP_HOST=${SMTP_HOST:-mx.jeffemmett.com}
+      - SMTP_HOST=${SMTP_HOST:-mail.rmail.online}
       - SMTP_PORT=${SMTP_PORT:-587}
-      - SMTP_USER=${SMTP_USER:-noreply@jeffemmett.com}
+      - SMTP_USER=${SMTP_USER:-noreply@rspace.online}
       - SMTP_PASS=${SMTP_PASS}
-      - SMTP_FROM=${SMTP_FROM:-EncryptID <noreply@jeffemmett.com>}
+      - SMTP_FROM=${SMTP_FROM:-EncryptID <noreply@rspace.online>}
       - RECOVERY_URL=${RECOVERY_URL:-https://auth.rspace.online/recover}
     labels:
       # Traefik auto-discovery
diff --git a/src/encryptid/server.ts b/src/encryptid/server.ts
index 19f5f56..91ce62b 100644
--- a/src/encryptid/server.ts
+++ b/src/encryptid/server.ts
@@ -57,12 +57,12 @@ const CONFIG = {
   sessionDuration: 15 * 60,  // 15 minutes
   refreshDuration: 7 * 24 * 60 * 60,  // 7 days
   smtp: {
-    host: process.env.SMTP_HOST || 'mx.jeffemmett.com',
+    host: process.env.SMTP_HOST || 'mail.rmail.online',
     port: parseInt(process.env.SMTP_PORT || '587'),
     secure: false, // STARTTLS on 587
-    user: process.env.SMTP_USER || 'noreply@jeffemmett.com',
+    user: process.env.SMTP_USER || 'noreply@rspace.online',
     pass: process.env.SMTP_PASS || '',
-    from: process.env.SMTP_FROM || 'EncryptID <noreply@jeffemmett.com>',
+    from: process.env.SMTP_FROM || 'EncryptID <noreply@rspace.online>',
   },
   recoveryUrl: process.env.RECOVERY_URL || 'https://auth.rspace.online/recover',
   allowedOrigins: [