diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request.go b/internal/auth/repository/eventsourcing/eventstore/auth_request.go
index 5705971343..67c1235245 100644
--- a/internal/auth/repository/eventsourcing/eventstore/auth_request.go
+++ b/internal/auth/repository/eventsourcing/eventstore/auth_request.go
@@ -457,7 +457,7 @@ func (repo *AuthRequestRepo) getAuthRequestNextSteps(ctx context.Context, id, us
 	}
 	steps, err := repo.nextSteps(ctx, request, checkLoggedIn)
 	if err != nil {
-		return nil, err
+		return request, err
 	}
 	request.PossibleSteps = steps
 	return request, nil
diff --git a/internal/ui/login/handler/auth_request.go b/internal/ui/login/handler/auth_request.go
index 4eb62d3578..dd2f0a89c4 100644
--- a/internal/ui/login/handler/auth_request.go
+++ b/internal/ui/login/handler/auth_request.go
@@ -25,7 +25,7 @@ func (l *Login) getAuthRequest(r *http.Request) (*domain.AuthRequest, error) {
 func (l *Login) getAuthRequestAndParseData(r *http.Request, data interface{}) (*domain.AuthRequest, error) {
 	authReq, err := l.getAuthRequest(r)
 	if err != nil {
-		return nil, err
+		return authReq, err
 	}
 	err = l.parser.Parse(r, data)
 	return authReq, err