diff --git a/spotify-auth/firebase.json b/spotify-auth/firebase.json
index e7c9fc271b..a46b34b8a7 100644
--- a/spotify-auth/firebase.json
+++ b/spotify-auth/firebase.json
@@ -3,6 +3,16 @@
     "rules": "database.rules.json"
   },
   "hosting": {
-    "public": "public"
+    "public": "public",
+    "rewrites": [
+      {
+        "source": "/redirect",
+        "function": "redirect"
+      },
+      {
+        "source": "/token",
+        "function": "token"
+      }
+    ]
   }
 }
diff --git a/spotify-auth/functions/index.js b/spotify-auth/functions/index.js
index 5f2ec914cb..bc33f03536 100644
--- a/spotify-auth/functions/index.js
+++ b/spotify-auth/functions/index.js
@@ -41,14 +41,14 @@ const Spotify = new SpotifyWebApi({
 const OAUTH_SCOPES = ['user-read-email'];
 
 /**
- * Redirects the User to the Spotify authentication consent screen. Also the 'state' cookie is set for later state
+ * Redirects the User to the Spotify authentication consent screen. Also the '__session' cookie is set for later state
  * verification.
  */
 exports.redirect = functions.https.onRequest((req, res) => {
   cookieParser()(req, res, () => {
-    const state = req.cookies.state || crypto.randomBytes(20).toString('hex');
+    const state = req.cookies.__session || crypto.randomBytes(20).toString('hex');
+    res.cookie('__session', state.toString(), {maxAge: 3600000, secure: true, httpOnly: true});
     functions.logger.log('Setting verification state:', state);
-    res.cookie('state', state.toString(), {maxAge: 3600000, secure: true, httpOnly: true});
     const authorizeURL = Spotify.createAuthorizeURL(OAUTH_SCOPES, state.toString());
     res.redirect(authorizeURL);
   });
@@ -56,18 +56,18 @@ exports.redirect = functions.https.onRequest((req, res) => {
 
 /**
  * Exchanges a given Spotify auth code passed in the 'code' URL query parameter for a Firebase auth token.
- * The request also needs to specify a 'state' query parameter which will be checked against the 'state' cookie.
+ * The request also needs to specify a 'state' query parameter which will be checked against the '__session' cookie.
  * The Firebase custom auth token is sent back in a JSONP callback function with function name defined by the
  * 'callback' query parameter.
  */
 exports.token = functions.https.onRequest((req, res) => {
   try {
     cookieParser()(req, res, () => {
-      functions.logger.log('Received verification state:', req.cookies.state);
+      functions.logger.log('Received verification state:', req.cookies.__session);
       functions.logger.log('Received state:', req.query.state);
-      if (!req.cookies.state) {
+      if (!req.cookies.__session) {
         throw new Error('State cookie not set or expired. Maybe you took too long to authorize. Please try again.');
-      } else if (req.cookies.state !== req.query.state) {
+      } else if (req.cookies.__session !== req.query.state) {
         throw new Error('State validation failed');
       }
       functions.logger.log('Received auth code:', req.query.code);
diff --git a/spotify-auth/public/popup.html b/spotify-auth/public/popup.html
index d8c8b75ea1..3632289a5f 100644
--- a/spotify-auth/public/popup.html
+++ b/spotify-auth/public/popup.html
@@ -65,14 +65,14 @@
     document.body.innerText = 'Error back from the Spotify auth page: ' + error;
   } else if(!code) {
     // Start the auth flow.
-    window.location.href  = 'https://us-central1-' + getFirebaseProjectId() + '.cloudfunctions.net/redirect';
+    window.location.href  = '/redirect';
   } else {
     // Use JSONP to load the 'token' Firebase Function to exchange the auth code against a Firebase custom token.
     const script = document.createElement('script');
     script.type = 'text/javascript';
     // This is the URL to the HTTP triggered 'token' Firebase Function.
     // See https://firebase.google.com/docs/functions.
-    var tokenFunctionURL = 'https://us-central1-' + getFirebaseProjectId() + '.cloudfunctions.net/token';
+    var tokenFunctionURL = '/token';
     script.src = tokenFunctionURL +
         '?code=' + encodeURIComponent(code) +
         '&state=' + encodeURIComponent(state) +