diff --git a/internal/auditlogintegration/handler_networkconnection.go b/internal/auditlogintegration/handler_networkconnection.go
index 7ba05d6d..243d646e 100644
--- a/internal/auditlogintegration/handler_networkconnection.go
+++ b/internal/auditlogintegration/handler_networkconnection.go
@@ -3,12 +3,12 @@ package auditlogintegration
 import (
 	"context"
 
-    "go.containerssh.io/libcontainerssh/auditlog/message"
-    publicAuth "go.containerssh.io/libcontainerssh/auth"
-    "go.containerssh.io/libcontainerssh/internal/auditlog"
-    internalAuth "go.containerssh.io/libcontainerssh/internal/auth"
-    "go.containerssh.io/libcontainerssh/internal/sshserver"
-    "go.containerssh.io/libcontainerssh/metadata"
+	"go.containerssh.io/libcontainerssh/auditlog/message"
+	publicAuth "go.containerssh.io/libcontainerssh/auth"
+	"go.containerssh.io/libcontainerssh/internal/auditlog"
+	internalAuth "go.containerssh.io/libcontainerssh/internal/auth"
+	"go.containerssh.io/libcontainerssh/internal/sshserver"
+	"go.containerssh.io/libcontainerssh/metadata"
 )
 
 type networkConnectionHandler struct {
@@ -44,8 +44,8 @@ func (n *networkConnectionHandler) OnAuthKeyboardInteractive(
 				return answers, err
 			}
 			var auditAnswers []message.KeyboardInteractiveAnswer
-			for _, q := range auditQuestions {
-				a, err := answers.GetByQuestionText(q.Question)
+			for _, q := range questions {
+				a, err := answers.Get(q)
 				if err != nil {
 					return answers, err
 				}