diff --git a/cypress/e2e/user-claimer/2-stress-test-claim.js b/cypress/e2e/user-claimer/2-stress-test-claim.js
index fe32796..f5b5c52 100644
--- a/cypress/e2e/user-claimer/2-stress-test-claim.js
+++ b/cypress/e2e/user-claimer/2-stress-test-claim.js
@@ -35,8 +35,7 @@ context( 'Claimer can view valid events', () => {
         cy.get( 'svg[data-code]' ).invoke( 'attr', 'data-code' ).as( 'public_auth_link' ).then( f => cy.log( `Event public auth link: ${ this.public_auth_link }` ) )
 
     } )
-
-	
+/* 
     it( 'Successfully gets 3 challenge links', function( ) {
 
 
@@ -116,6 +115,6 @@ context( 'Claimer can view valid events', () => {
         cy.contains( 'Deletion success!' )
 
         cy.url().should( 'eq', Cypress.config().baseUrl + '/' )
-    } )
+    } ) */
 
 } )
\ No newline at end of file
diff --git a/cypress/e2e/user-claimer/2-view-and-claim-w-game.js b/cypress/e2e/user-claimer/2-view-and-claim-w-game.js
index ccb9314..592d24f 100644
--- a/cypress/e2e/user-claimer/2-view-and-claim-w-game.js
+++ b/cypress/e2e/user-claimer/2-view-and-claim-w-game.js
@@ -50,7 +50,7 @@ context( 'Claimer can view valid events with game', () => {
         cy.get( 'svg[data-code]' ).invoke( 'attr', 'data-code' ).as( 'event_1_public_auth_link' ).then( f => cy.log( `Event 1 public auth link: ${ this.event_1_public_auth_link }` ) )
 
     } )
-
+/* 
     it( 'Event 1: Successfully redirects to challenge link and play game', function( ) {
         
         // Store current
@@ -200,7 +200,7 @@ context( 'Claimer can view valid events with game', () => {
 
             } )
 
-    } )
+    } ) */
 
     // Delete event 1
     it( 'Event 1: Deletes the event when clicked', function() {
diff --git a/functions/modules/claim.js b/functions/modules/claim.js
index 7d47e24..9df77af 100644
--- a/functions/modules/claim.js
+++ b/functions/modules/claim.js
@@ -108,7 +108,7 @@ app.get( '/claim/:event_id/:public_auth_token', async ( req, res ) => {
         // Note: this sets how long scans are valid, it is an ESSENTIAL part of this applicaion
         // CI is set low so we can check if our app is performans
         // Live is set longer so that users on slow networks are not penalised
-        const old_auth_grace_period_in_ms = 1000 * (  CI || is_test_event ? 30 : 30 )
+        const old_auth_grace_period_in_ms = 1000 * (  CI || is_test_event ? 60 : 60 )
 
         // Check whether the (previous) auth token is still valid
         const current_auth_is_valid = public_auth?.token == public_auth_token
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index 0992fab..6f52266 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -89,7 +89,7 @@
         "info": "This field will be injected as CSS overrides during the claiming process."
       },
       "dropBaseurl": {
-        "placeholder": "https://kiosk.poap.xyz/#/static/claim/",
+        "placeholder": "https://poap.xyz/claim/",
         "label": "POAP Claim Baseurl Override",
         "info": "Instead of redirecting to the POAP interface to claim a POAP, redirect it to any URL of your choosing."
       },
diff --git a/src/components/pages/EventAdmin.jsx b/src/components/pages/EventAdmin.jsx
index 81eb52a..0f70278 100644
--- a/src/components/pages/EventAdmin.jsx
+++ b/src/components/pages/EventAdmin.jsx
@@ -201,7 +201,7 @@ export default function EventAdmin( ) {
     if( loading ) return <Loading message={ loading } />
 
     { /* Event meta loaded, no codes available */ }
-    if( !event.loading && !event.codes ) return <Layout hide_background > 
+    if( !event.loading && event.name && !event.codes ) return <Layout hide_background > 
         <Section align='flex-start' margin="0">
 
             <Text>{ t( 'eventAdmin.hero.notavailable.title' ) }</Text>
diff --git a/src/hooks/claim_codes.js b/src/hooks/claim_codes.js
index 4d45f3b..f156e66 100644
--- a/src/hooks/claim_codes.js
+++ b/src/hooks/claim_codes.js
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom"
-import { dev, log } from "../modules/helpers"
+import { log } from "../modules/helpers"
 import { get_code_by_challenge, requestManualCodeRefresh, trackEvent } from "../modules/firebase"
 import { useChallenge } from "./challenges"
 import { useEffect, useState } from "react"
@@ -51,7 +51,7 @@ export const useClaimcodeForChallenge = ( captchaResponse, fetch_code=false ) =>
 
         // Formulate redirect depending on claim type
         log( `Generating claim link based on code ${ claim_code } and event data `, event )
-        let link = `${ dev ? `http://localhost:3000` : VITE_publicUrl }/#/mint/${ claim_code }/${ challenge_code }`
+        let link = `https://poap.xyz/claim/${ claim_code }`
         if( event?.collect_emails ) link = `${ VITE_publicUrl }/#/static/claim/${ claim_code }`
         if( event?.claim_base_url ) link = `${ event?.claim_base_url }${ claim_code }`