diff --git a/.env b/.env
index 8ae60da..854bba3 100644
--- a/.env
+++ b/.env
@@ -20,6 +20,9 @@ AZURE_AD_TENANT_ID=f69d1a93-bfba-498a-9b60-e87c1bc26276
 
 # First APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw
 
+APPLE_TEAM_ID=XC57P9SXDK
+APPLE_KEY_ID=TB3V355G5Y
+
 APPLE_APP_ID=com.mwhitnessing.sofia
 APPLE_SECRET=eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJpYXQiOjE3MTMzMDQ1OTMsImV4cCI6MTcyODg1NjU5MywiYXVkIjoiaHR0cHM6Ly9hcHBsZWlkLmFwcGxlLmNvbSIsImlzcyI6IlhDNTdQOVNYREsiLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.iO2prjQ_4P7F17R7LTJfG9zHluj59uUtm8DA1LbK49jVBMeGHQP_Az7s_yU5D-GeMHSwU7VnVHcaVKiGWT_Yjg
 
@@ -27,8 +30,6 @@ APPLE_SECRET=eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJp
 #APPLE_APP_ID=XC57P9SXDK.com.mwhitnessing.sofia
 #APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw
 # to generate
-APPLE_TEAM_ID=XC57P9SXDK
-APPLE_KEY_ID=TB3V355G5Y
 
 
 AUTH0_ID=Aa9f3HJowauUrmBVY4iQzQJ7fYsaZDbK
diff --git a/pages/api/auth/apple-signin.ts b/pages/api/auth/apple-signin.ts
index d8f2503..62c2dc5 100644
--- a/pages/api/auth/apple-signin.ts
+++ b/pages/api/auth/apple-signin.ts
@@ -4,14 +4,17 @@ import axios from 'axios';
 import fs from 'fs';
 import path from 'path';
 
+const dotenv = require("dotenv");
+
 export default async function handler(req, res) {
     if (req.method === 'GET') {
         // Generate the client secret
         const clientSecret = generateClientSecret();
-        const redirectUri = `${req.headers.origin}/api/auth/apple/callback`;
+        // const redirectUri = `${req.headers.origin}/api/auth/apple/callback`;
+        const redirectUri = `https://sofia.mwitnessing.com/api/auth/callback/apple`;
 
         // Redirect to Apple's authorization page
-        res.redirect(`https://appleid.apple.com/auth/authorize?response_type=code&client_id=${process.env.APPLE_CLIENT_ID}&redirect_uri=${encodeURIComponent(redirectUri)}&scope=name+email&response_mode=form_post&state=STATE&client_secret=${encodeURIComponent(clientSecret)}`);
+        res.redirect(`https://appleid.apple.com/auth/authorize?response_type=code&client_id=${process.env.APPLE_APP_ID}&redirect_uri=${encodeURIComponent(redirectUri)}&scope=name+email&response_mode=form_post&state=STATE&client_secret=${encodeURIComponent(clientSecret)}`);
     } else {
         res.status(405).json({ error: 'Method not allowed' });
     }
@@ -21,7 +24,7 @@ function generateClientSecret() {
     const appleKey = fs.readFileSync(path.resolve('./_deploy/appleKey.p8'), 'utf8');
     const teamID = process.env.APPLE_TEAM_ID || "XC57P9SXDK";
     const keyID = process.env.APPLE_KEY_ID || "TB3V355G5Y";
-    const appleAppID = process.env.APPLE_APP_ID || "com.mwitnessing.mwitnessing";
+    const appleAppID = process.env.APPLE_APP_ID;
 
     // Token expiration
     const now = Math.floor(Date.now() / 1000);