diff --git a/app/src/pages/login.tsx b/app/src/pages/login.tsx
index b67f9fc..e1f510d 100644
--- a/app/src/pages/login.tsx
+++ b/app/src/pages/login.tsx
@@ -72,11 +72,13 @@ export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 					</Footer>
 				</Fragment>
 			)}
-			{config.is_sign_up_enabled && (
-				<FooterContent>
-					Don't have an account? <Link to="/app/signup"> Sign Up</Link>
-				</FooterContent>
-			)}
+			{config.is_basic_authentication_enabled &&
+				!config.is_magic_link_login_enabled &&
+				config.is_sign_up_enabled && (
+					<FooterContent>
+						Don't have an account? <Link to="/app/signup"> Sign Up</Link>
+					</FooterContent>
+				)}
 		</Fragment>
 	);
 }
diff --git a/server/handlers/verify_email.go b/server/handlers/verify_email.go
index 7adb672..a6e28e1 100644
--- a/server/handlers/verify_email.go
+++ b/server/handlers/verify_email.go
@@ -42,6 +42,7 @@ func VerifyEmailHandler() gin.HandlerFunc {
 
 		// verify if token exists in db
 		hostname := parsers.GetHost(c)
+		log.Debug("hostname used for jwt verification: ", hostname)
 		claim, err := token.ParseJWTToken(tokenInQuery, hostname, verificationRequest.Nonce, verificationRequest.Email)
 		if err != nil {
 			log.Debug("Error parsing token: ", err)
diff --git a/server/token/jwt.go b/server/token/jwt.go
index 350c2f5..4ff8895 100644
--- a/server/token/jwt.go
+++ b/server/token/jwt.go
@@ -3,10 +3,12 @@ package token
 import (
 	"errors"
 
+	"github.com/golang-jwt/jwt"
+	log "github.com/sirupsen/logrus"
+
 	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/crypto"
 	"github.com/authorizerdev/authorizer/server/memorystore"
-	"github.com/golang-jwt/jwt"
 )
 
 // SignJWTToken common util to sing jwt token
@@ -115,6 +117,7 @@ func ParseJWTToken(token, hostname, nonce, subject string) (jwt.MapClaims, error
 	intIat := int64(claims["iat"].(float64))
 	claims["exp"] = intExp
 	claims["iat"] = intIat
+	log.Debug("claims: ", claims)
 	clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID)
 	if err != nil {
 		return claims, err
@@ -196,6 +199,7 @@ func ParseJWTTokenWithoutNonce(token, hostname string) (jwt.MapClaims, error) {
 	intIat := int64(claims["iat"].(float64))
 	claims["exp"] = intExp
 	claims["iat"] = intIat
+	log.Debug("claims: ", claims)
 	clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID)
 	if err != nil {
 		return claims, err