diff --git a/internal/query/action.go b/internal/query/action.go
index 311969206c..f1bf2a6101 100644
--- a/internal/query/action.go
+++ b/internal/query/action.go
@@ -114,9 +114,7 @@ func (q *Queries) GetActionByID(ctx context.Context, id string, orgID string) (*
 	stmt, scan := prepareActionQuery()
 	query, args, err := stmt.Where(
 		sq.Eq{
-			ActionColumnID.identifier(): id,
-		},
-		sq.Eq{
+			ActionColumnID.identifier():            id,
 			ActionColumnResourceOwner.identifier(): orgID,
 		}).ToSql()
 	if err != nil {
diff --git a/internal/query/action_flow.go b/internal/query/action_flow.go
index 5b656ebedb..cca43ab3f2 100644
--- a/internal/query/action_flow.go
+++ b/internal/query/action_flow.go
@@ -54,9 +54,7 @@ func (q *Queries) GetFlow(ctx context.Context, flowType domain.FlowType, orgID s
 	query, scan := q.prepareFlowQuery()
 	stmt, args, err := query.Where(
 		sq.Eq{
-			FlowsTriggersColumnFlowType.identifier(): flowType,
-		},
-		sq.Eq{
+			FlowsTriggersColumnFlowType.identifier():      flowType,
 			FlowsTriggersColumnResourceOwner.identifier(): orgID,
 		}).ToSql()
 	if err != nil {
@@ -74,14 +72,11 @@ func (q *Queries) GetActionsByFlowAndTriggerType(ctx context.Context, flowType d
 	stmt, scan := q.prepareTriggerActionsQuery()
 	query, args, err := stmt.Where(
 		sq.Eq{
-			FlowsTriggersColumnFlowType.identifier(): flowType,
-		},
-		sq.Eq{
-			FlowsTriggersColumnTriggerType.identifier(): triggerType,
-		},
-		sq.Eq{
+			FlowsTriggersColumnFlowType.identifier():      flowType,
+			FlowsTriggersColumnTriggerType.identifier():   triggerType,
 			FlowsTriggersColumnResourceOwner.identifier(): orgID,
-		}).ToSql()
+		},
+	).ToSql()
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "QUERY-Dgff3", "Errors.Query.SQLStatement")
 	}
diff --git a/internal/ui/login/handler/external_login_handler.go b/internal/ui/login/handler/external_login_handler.go
index 42be95a169..a70e058cfc 100644
--- a/internal/ui/login/handler/external_login_handler.go
+++ b/internal/ui/login/handler/external_login_handler.go
@@ -142,6 +142,7 @@ func (l *Login) handleExternalLoginCallback(w http.ResponseWriter, r *http.Reque
 			return
 		}
 		l.handleExternalUserAuthenticated(w, r, authReq, idpConfig, userAgentID, tokens)
+		return
 	}
 	l.renderError(w, r, authReq, caos_errors.ThrowPreconditionFailed(nil, "RP-asff2", "Errors.ExternalIDP.IDPTypeNotImplemented"))
 	return