diff --git a/internal/ui/login/handler/login_success_handler.go b/internal/ui/login/handler/login_success_handler.go
index ee83b7263..d7aec74c8 100644
--- a/internal/ui/login/handler/login_success_handler.go
+++ b/internal/ui/login/handler/login_success_handler.go
@@ -23,6 +23,7 @@ func (l *Login) handleLoginSuccess(w http.ResponseWriter, r *http.Request) {
 	authRequest, _ := l.getAuthRequest(r)
 	if authRequest == nil {
 		l.renderSuccessAndCallback(w, r, nil, nil)
+		return
 	}
 	for _, step := range authRequest.PossibleSteps {
 		if step.Type() != domain.NextStepLoginSucceeded && step.Type() != domain.NextStepRedirectToCallback {
diff --git a/internal/ui/login/handler/register_handler.go b/internal/ui/login/handler/register_handler.go
index 3a1946e55..4e501504c 100644
--- a/internal/ui/login/handler/register_handler.go
+++ b/internal/ui/login/handler/register_handler.go
@@ -70,7 +70,7 @@ func (l *Login) handleRegisterCheck(w http.ResponseWriter, r *http.Request) {
 	resourceOwner := iam.GlobalOrgID
 	memberRoles := []string{domain.RoleSelfManagementGlobal}
 
-	if authRequest.RequestedOrgID != "" && authRequest.RequestedOrgID != iam.GlobalOrgID {
+	if authRequest != nil && authRequest.RequestedOrgID != "" && authRequest.RequestedOrgID != iam.GlobalOrgID {
 		memberRoles = nil
 		resourceOwner = authRequest.RequestedOrgID
 	}