diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7f1e5d5624..6c7f7ffb65 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -183,12 +183,12 @@ The test suite must pass before merging the PR to our main branch. Any new featu
 
 #### Tests with dependencies
 
-Some tests, such as the [PAM CLI tests](https://github.com/ubuntu/authd/blob/5ba54c0a573f34e99782fe624b090ab229798fc3/pam/integration-tests/integration_test.go#L21), use external tools such as [vhs](https://github.com/charmbracelet/vhs)
+Some tests, such as the [PAM CLI tests](https://github.com/ubuntu/authd/blob/5ba54c0a573f34e99782fe624b090ab229798fc3/pam/integration-tests/integration_test.go#L21), use external tools such as [VHS](https://github.com/charmbracelet/vhs)
 to record and run the tape files needed for the tests. Those tools are not included in the project dependencies and must be installed manually.
 
 Information about these tools and their usage will be linked below:
 
-- [vhs](https://github.com/charmbracelet/vhs?tab=readme-ov-file#tutorial): tutorial on using vhs as a CLI-based video recorder
+- [VHS](https://github.com/charmbracelet/vhs?tab=readme-ov-file#tutorial): tutorial on using VHS as a CLI-based video recorder
 
 ### Code style
 
diff --git a/cmd/authd/daemon/config.go b/cmd/authd/daemon/config.go
index a1cf95735c..480577ee1d 100644
--- a/cmd/authd/daemon/config.go
+++ b/cmd/authd/daemon/config.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
@@ -94,6 +93,5 @@ func setVerboseMode(level int) {
 		log.SetLevel(log.InfoLevel)
 	default:
 		log.SetLevel(log.DebugLevel)
-		slog.SetLogLoggerLevel(slog.LevelDebug)
 	}
 }
diff --git a/cmd/authd/main.go b/cmd/authd/main.go
index 8314ec27e3..f3c3aa6db5 100644
--- a/cmd/authd/main.go
+++ b/cmd/authd/main.go
@@ -55,13 +55,16 @@ func installSignalHandler(a app) func() {
 		for {
 			switch v, ok := <-c; v {
 			case syscall.SIGINT, syscall.SIGTERM:
+				log.Infof(context.Background(), "Received signal %d (%s), exiting...", v, v.String())
 				a.Quit()
 				return
 			case syscall.SIGHUP:
 				if a.Hup() {
+					log.Info(context.Background(), "Received SIGHUP, exiting...")
 					a.Quit()
 					return
 				}
+				log.Info(context.Background(), "Received SIGHUP, but nothing to do")
 			default:
 				// channel was closed: we exited
 				if !ok {
diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go
index df6f8f7f00..be850f3837 100644
--- a/internal/daemon/daemon.go
+++ b/internal/daemon/daemon.go
@@ -132,13 +132,12 @@ func (d *Daemon) Serve(ctx context.Context) (err error) {
 // Quit gracefully quits listening loop and stops the grpc server.
 // It can drops any existing connexion is force is true.
 func (d Daemon) Quit(ctx context.Context, force bool) {
-	log.Infof(ctx, "Stopping daemon requested for socket %s.", d.lis.Addr())
 	if force {
 		d.grpcServer.Stop()
 		return
 	}
 
-	log.Info(ctx, "Wait for active requests to close.")
+	log.Info(ctx, "Waiting for pending requests to finish")
 	d.grpcServer.GracefulStop()
-	log.Debug(ctx, "All connections have now ended.")
+	log.Info(ctx, "gRPC server gracefully stopped")
 }
diff --git a/internal/daemon/daemon_test.go b/internal/daemon/daemon_test.go
index 984296820b..d42c66c90b 100644
--- a/internal/daemon/daemon_test.go
+++ b/internal/daemon/daemon_test.go
@@ -254,10 +254,10 @@ func TestQuit(t *testing.T) {
 				require.True(t, connected, "new connection should be made allowed")
 			}
 
-			// Request quitting.
-			quiteDone := make(chan struct{})
+			// Request server shutdown
+			shutdownRequested := make(chan struct{})
 			go func() {
-				defer close(quiteDone)
+				defer close(shutdownRequested)
 				d.Quit(context.Background(), tc.force)
 			}()
 
@@ -269,8 +269,8 @@ func TestQuit(t *testing.T) {
 
 			serverHasQuit := func() bool {
 				select {
-				case _, running := <-quiteDone:
-					return !running
+				case _, ok := <-shutdownRequested:
+					return !ok
 				default:
 					return false
 				}
@@ -287,7 +287,7 @@ func TestQuit(t *testing.T) {
 			// drop connection
 			disconnectClient()
 
-			require.Eventually(t, serverHasQuit, 100*time.Millisecond, 10*time.Millisecond, "Server should quit with no more active connection")
+			require.Eventually(t, serverHasQuit, 1*time.Second, 10*time.Millisecond, "Server should quit with no more active connection")
 		})
 	}
 }
diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go
new file mode 100644
index 0000000000..b31f6a423a
--- /dev/null
+++ b/internal/testlog/testlog.go
@@ -0,0 +1,163 @@
+// Package testlog provides utilities for logging test output.
+package testlog
+
+import (
+	"fmt"
+	"os/exec"
+	"testing"
+	"time"
+)
+
+type runWithTimingOptions struct {
+	doNotSetStdoutAndStderr         bool
+	onlyPrintStdoutAndStderrOnError bool
+}
+
+// RunWithTimingOption is a function that configures the RunWithTiming function.
+type RunWithTimingOption func(options *runWithTimingOptions)
+
+// DoNotSetStdoutAndStderr prevents RunWithTiming from setting the stdout and stderr of the given command.
+// By default, RunWithTiming sets stdout and stderr to the test's output.
+func DoNotSetStdoutAndStderr() RunWithTimingOption {
+	return func(options *runWithTimingOptions) {
+		options.doNotSetStdoutAndStderr = true
+	}
+}
+
+// OnlyPrintStdoutAndStderrOnError makes RunWithTiming only print the stdout and stderr of the given command if it fails.
+func OnlyPrintStdoutAndStderrOnError() RunWithTimingOption {
+	return func(options *runWithTimingOptions) {
+		options.onlyPrintStdoutAndStderrOnError = true
+	}
+}
+
+// RunWithTiming runs the given command while logging its duration with the provided message.
+//
+//nolint:thelper // we do call t.Helper() if t is not nil
+func RunWithTiming(t *testing.T, msg string, cmd *exec.Cmd, options ...RunWithTimingOption) error {
+	if t != nil {
+		t.Helper()
+	}
+
+	w := testWriterOrStderr(t)
+
+	opts := runWithTimingOptions{}
+	for _, f := range options {
+		f(&opts)
+	}
+
+	if opts.doNotSetStdoutAndStderr && opts.onlyPrintStdoutAndStderrOnError {
+		panic("onlyPrintStdoutAndStderrOnError and doNotSetStdoutAndStderr cannot be used together")
+	}
+
+	if !opts.doNotSetStdoutAndStderr && !opts.onlyPrintStdoutAndStderrOnError {
+		cmd.Stdout = w
+		cmd.Stderr = w
+	}
+
+	LogCommand(t, msg, cmd)
+	start := time.Now()
+
+	var err error
+	var out []byte
+	if opts.onlyPrintStdoutAndStderrOnError {
+		out, err = cmd.CombinedOutput()
+		if err != nil {
+			_, _ = w.Write(out)
+		}
+	} else {
+		err = cmd.Run()
+	}
+	duration := time.Since(start)
+
+	if err != nil {
+		fmt.Fprintf(w, redSeparatorf("%s failed in %.3fs with %v", msg, duration.Seconds(), err)+"\n")
+	} else {
+		fmt.Fprintf(w, separatorf("%s finished in %.3fs", msg, duration.Seconds())+"\n")
+	}
+
+	return err
+}
+
+// LogCommand logs the given command to stderr.
+//
+//nolint:thelper // we do call t.Helper() if t is not nil
+func LogCommand(t *testing.T, msg string, cmd *exec.Cmd) {
+	if t != nil {
+		t.Helper()
+	}
+	w := testWriterOrStderr(t)
+
+	sep := "----------------------------------------"
+	fmt.Fprintf(w, "\n"+separator(msg)+"command: %s\n%s\nenvironment: %s\n%s\n", cmd.String(), sep, cmd.Env, sep)
+}
+
+// LogStartSeparatorf logs a separator to stderr with the given formatted message.
+//
+//nolint:thelper // we do call t.Helper() if t is not nil
+func LogStartSeparatorf(t *testing.T, s string, args ...any) {
+	if t != nil {
+		t.Helper()
+	}
+	w := testWriterOrStderr(t)
+
+	fmt.Fprintf(w, "\n"+separatorf(s, args...))
+}
+
+// LogStartSeparator logs a separator to stderr with the given message.
+//
+//nolint:thelper // we do call t.Helper() if t is not nil
+func LogStartSeparator(t *testing.T, args ...any) {
+	if t != nil {
+		t.Helper()
+	}
+
+	LogStartSeparatorf(t, fmt.Sprint(args...))
+}
+
+// LogEndSeparatorf logs a separator to stderr with the given formatted message.
+//
+//nolint:thelper // we do call t.Helper() if t is not nil
+func LogEndSeparatorf(t *testing.T, s string, args ...any) {
+	if t != nil {
+		t.Helper()
+	}
+	w := testWriterOrStderr(t)
+
+	fmt.Fprintf(w, separatorf(s, args...)+"\n")
+}
+
+// LogEndSeparator logs a separator to stderr with the given message.
+//
+//nolint:thelper // we do call t.Helper() if t is not nil
+func LogEndSeparator(t *testing.T, args ...any) {
+	if t != nil {
+		t.Helper()
+	}
+
+	LogEndSeparatorf(t, fmt.Sprint(args...))
+}
+
+// separatorf returns a formatted separator string for logging purposes.
+func separatorf(s string, args ...any) string {
+	return highCyan("===== " + fmt.Sprintf(s, args...) + " =====\n")
+}
+
+// separator returns a separator string for logging purposes.
+func separator(args ...any) string {
+	return separatorf(fmt.Sprint(args...))
+}
+
+func redSeparatorf(s string, args ...any) string {
+	return highRed("===== " + fmt.Sprintf(s, args...) + " =====\n")
+}
+
+// highCyan returns a string with the given text in high-intensity cyan color for terminal output.
+func highCyan(s string) string {
+	return fmt.Sprintf("\033[1;36m%s\033[0m", s)
+}
+
+// highRed returns a string with the given text in high-intensity red color for terminal output.
+func highRed(s string) string {
+	return fmt.Sprintf("\033[1;31m%s\033[0m", s)
+}
diff --git a/internal/testlog/testlog_go125.go b/internal/testlog/testlog_go125.go
new file mode 100644
index 0000000000..0bbf356724
--- /dev/null
+++ b/internal/testlog/testlog_go125.go
@@ -0,0 +1,24 @@
+//go:build go1.25
+
+package testlog
+
+import (
+	"io"
+	"os"
+	"testing"
+)
+
+// NewTestWriter creates a new TestWriter that logs to t.
+//
+//nolint:thelper // we're not using t in any way that requires the helper annotation
+func NewTestWriter(t *testing.T) io.Writer {
+	return t.Output()
+}
+
+//nolint:thelper // we're not using t in any way that requires the helper annotation
+func testWriterOrStderr(t *testing.T) io.Writer {
+	if t != nil {
+		return t.Output()
+	}
+	return os.Stderr
+}
diff --git a/internal/testlog/testlog_pre125.go b/internal/testlog/testlog_pre125.go
new file mode 100644
index 0000000000..e4d198842e
--- /dev/null
+++ b/internal/testlog/testlog_pre125.go
@@ -0,0 +1,64 @@
+//go:build !go1.25
+
+package testlog
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"os"
+	"strings"
+	"sync"
+	"testing"
+)
+
+// TestWriter is an io.Writer that sends its output to a testing.T via t.Log,
+// ensuring logs are attributed to the correct test.
+// It buffers partial writes until a newline is seen.
+type TestWriter struct {
+	t   *testing.T
+	mu  sync.Mutex
+	buf bytes.Buffer
+}
+
+// NewTestWriter creates a new TestWriter that logs to t.
+//
+//nolint:thelper // we're not using t in any way that requires the helper annotation'
+func NewTestWriter(t *testing.T) *TestWriter {
+	return &TestWriter{t: t}
+}
+
+// Write implements io.Writer. It buffers until a newline is seen,
+// then flushes complete lines to t.Log. Remainders are held until
+// the next Write call.
+func (w *TestWriter) Write(p []byte) (n int, err error) {
+	w.t.Helper()
+
+	w.mu.Lock()
+	defer w.mu.Unlock()
+
+	n, err = w.buf.Write(p)
+	for {
+		line, errLine := w.buf.ReadString('\n')
+		if errors.Is(errLine, io.EOF) {
+			// leftover data without newline — keep it for next Write
+			w.buf.Reset()
+			w.buf.WriteString(line)
+			break
+		}
+		// Trim the newline, let t.Log add its own
+		w.t.Log(strings.TrimSuffix(line, "\n"))
+	}
+
+	return n, err
+}
+
+// testWriterOrStderr returns a TestWriter if t is non-nil, or os.Stderr otherwise.
+//
+//nolint:thelper // we're not using t in any way that requires the helper annotation'
+func testWriterOrStderr(t *testing.T) io.Writer {
+	if t != nil {
+		return NewTestWriter(t)
+	}
+	return os.Stderr
+}
diff --git a/internal/testutils/args.go b/internal/testutils/args.go
index 659e8a9dd8..65ce5248e1 100644
--- a/internal/testutils/args.go
+++ b/internal/testutils/args.go
@@ -99,3 +99,9 @@ func SleepMultiplier() float64 {
 func MultipliedSleepDuration(in time.Duration) time.Duration {
 	return time.Duration(math.Round(float64(in) * SleepMultiplier()))
 }
+
+// IsCI returns whether the test is running in CI environment.
+var IsCI = sync.OnceValue(func() bool {
+	_, ok := os.LookupEnv("GITHUB_ACTIONS")
+	return ok
+})
diff --git a/internal/testutils/artifacts.go b/internal/testutils/artifacts.go
new file mode 100644
index 0000000000..85d1b2dcae
--- /dev/null
+++ b/internal/testutils/artifacts.go
@@ -0,0 +1,128 @@
+package testutils
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"github.com/ubuntu/authd/internal/fileutils"
+)
+
+var (
+	authdTestSessionTime  = time.Now()
+	authdArtifactsDir     string
+	authdArtifactsDirOnce sync.Once
+)
+
+// ArtifactsDir returns the path to the directory where artifacts are stored.
+func ArtifactsDir(t *testing.T) string {
+	t.Helper()
+
+	authdArtifactsDirOnce.Do(func() {
+		authdArtifactsDir = createArtifactsDir(t)
+		t.Logf("Test artifacts directory: %s", authdArtifactsDir)
+	})
+
+	return authdArtifactsDir
+}
+
+func createArtifactsDir(t *testing.T) string {
+	t.Helper()
+
+	// We need to copy the artifacts to another directory, since the test directory will be cleaned up.
+	if dir := os.Getenv("AUTHD_TESTS_ARTIFACTS_PATH"); dir != "" {
+		if err := os.MkdirAll(dir, 0750); err != nil && !os.IsExist(err) {
+			require.NoError(t, err, "TearDown: could not create artifacts directory %q", authdArtifactsDir)
+		}
+		return dir
+	}
+
+	st := authdTestSessionTime
+	dirName := fmt.Sprintf("authd-test-artifacts-%d-%02d-%02dT%02d-%02d-%02d.%d-",
+		st.Year(), st.Month(), st.Day(), st.Hour(), st.Minute(), st.Second(),
+		st.UnixMilli())
+
+	dir, err := os.MkdirTemp(os.TempDir(), dirName)
+	require.NoError(t, err, "TearDown: could not create artifacts directory %q", authdArtifactsDir)
+
+	return dir
+}
+
+// saveFilesAsArtifacts saves the specified artifacts to a temporary directory if the test failed.
+func saveFilesAsArtifacts(t *testing.T, artifacts ...string) {
+	t.Helper()
+
+	dir := filepath.Join(ArtifactsDir(t), t.Name())
+	err := os.MkdirAll(dir, 0750)
+	require.NoError(t, err, "TearDown: could not create artifacts directory %q", dir)
+
+	// Copy the artifacts to the artifacts directory.
+	for _, artifact := range artifacts {
+		target := filepath.Join(dir, filepath.Base(artifact))
+		t.Logf("Saving artifact %q", target)
+		err = fileutils.CopyFile(artifact, target)
+		if err != nil {
+			t.Logf("Teardown: failed to copy artifact %q to %q: %v", artifact, dir, err)
+		}
+	}
+}
+
+// MaybeSaveFilesAsArtifactsOnCleanup saves the specified artifacts to a temporary directory if the test failed
+// or if the AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE environment variable is set.
+func MaybeSaveFilesAsArtifactsOnCleanup(t *testing.T, artifacts ...string) {
+	t.Helper()
+
+	t.Cleanup(func() {
+		if !t.Failed() && os.Getenv("AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE") == "" {
+			return
+		}
+		saveFilesAsArtifacts(t, artifacts...)
+	})
+}
+
+func saveBytesAsArtifact(t *testing.T, content []byte, filename string) {
+	t.Helper()
+
+	dir := filepath.Join(ArtifactsDir(t), t.Name())
+	err := os.MkdirAll(dir, 0750)
+	require.NoError(t, err, "TearDown: could not create artifacts directory %q", dir)
+
+	target := filepath.Join(dir, filename)
+	t.Logf("Writing artifact %q", target)
+
+	// Write the bytes to the artifacts directory.
+	err = os.WriteFile(target, content, 0600)
+	if err != nil {
+		t.Logf("Teardown: failed to write artifact %q to %q: %v", filename, dir, err)
+	}
+}
+
+// MaybeSaveBytesAsArtifactOnCleanup saves the specified bytes to a temporary directory if the test failed
+// or if the AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE environment variable is set.
+func MaybeSaveBytesAsArtifactOnCleanup(t *testing.T, content []byte, filename string) {
+	t.Helper()
+
+	t.Cleanup(func() {
+		if !t.Failed() && os.Getenv("AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE") == "" {
+			return
+		}
+		saveBytesAsArtifact(t, content, filename)
+	})
+}
+
+// MaybeSaveBufferAsArtifactOnCleanup saves the specified buffer to a temporary directory if the test failed
+// or if the AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE environment variable is set.
+func MaybeSaveBufferAsArtifactOnCleanup(t *testing.T, buf *SyncBuffer, filename string) {
+	t.Helper()
+
+	t.Cleanup(func() {
+		if !t.Failed() && os.Getenv("AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE") == "" {
+			return
+		}
+		saveBytesAsArtifact(t, buf.Bytes(), filename)
+	})
+}
diff --git a/internal/testutils/cmd.go b/internal/testutils/cmd.go
new file mode 100644
index 0000000000..95c4dc96c8
--- /dev/null
+++ b/internal/testutils/cmd.go
@@ -0,0 +1 @@
+package testutils
diff --git a/internal/testutils/daemon.go b/internal/testutils/daemon.go
index 24620cb73e..8a54006938 100644
--- a/internal/testutils/daemon.go
+++ b/internal/testutils/daemon.go
@@ -1,10 +1,10 @@
 package testutils
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/ubuntu/authd/internal/grpcutils"
 	"github.com/ubuntu/authd/internal/services/errmessages"
+	"github.com/ubuntu/authd/internal/testlog"
 	"github.com/ubuntu/authd/internal/users/db"
 	"github.com/ubuntu/authd/internal/users/localentries"
 	"google.golang.org/grpc"
@@ -24,13 +25,13 @@ import (
 )
 
 type daemonOptions struct {
-	dbPath     string
-	existentDB string
-	socketPath string
-	pidFile    string
-	outputFile string
-	shared     bool
-	env        []string
+	dbPath                   string
+	existentDB               string
+	socketPath               string
+	pidFile                  string
+	saveOutputAsTestArtifact bool
+	shared                   bool
+	env                      []string
 }
 
 // DaemonOption represents an optional function that can be used to override some of the daemon default values.
@@ -72,10 +73,10 @@ func WithPidFile(pidFile string) DaemonOption {
 	}
 }
 
-// WithOutputFile sets the path where the process log will be saved.
-func WithOutputFile(outputFile string) DaemonOption {
+// WithOutputAsTestArtifact saves the daemon output to a test artifact.
+func WithOutputAsTestArtifact() DaemonOption {
 	return func(o *daemonOptions) {
-		o.outputFile = outputFile
+		o.saveOutputAsTestArtifact = true
 	}
 }
 
@@ -113,9 +114,9 @@ func WithGroupFileOutput(groupFile string) DaemonOption {
 	}
 }
 
-// RunDaemon runs the daemon in a separate process and returns the socket path and a channel that will be closed when
-// the daemon stops.
-func RunDaemon(ctx context.Context, t *testing.T, execPath string, args ...DaemonOption) (socketPath string, stopped chan struct{}) {
+// StartAuthd starts authd in a separate process, waits for it to be ready to receive connections,
+// and returns its socket path and a channel that is closed when authd stops.
+func StartAuthd(ctx context.Context, t *testing.T, execPath string, args ...DaemonOption) (socketPath string, stopped chan struct{}) {
 	t.Helper()
 
 	opts := &daemonOptions{}
@@ -158,9 +159,8 @@ paths:
 
 	// #nosec:G204 - we control the command arguments in tests
 	cmd := exec.CommandContext(ctx, execPath, "-c", configPath)
-	opts.env = append(opts.env, os.Environ()...)
 	opts.env = append(opts.env, fmt.Sprintf("AUTHD_EXAMPLE_BROKER_SLEEP_MULTIPLIER=%f", SleepMultiplier()))
-	cmd.Env = AppendCovEnv(opts.env)
+	cmd.Env = append(AppendCovEnv(opts.env), MinimalPathEnv)
 
 	// This is the function that is called by CommandContext when the context is cancelled.
 	cmd.Cancel = func() error {
@@ -168,21 +168,31 @@ paths:
 		return cmd.Process.Signal(os.Signal(syscall.SIGTERM))
 	}
 
-	// Start the daemon
+	// Start authd
+	start := time.Now()
 	stopped = make(chan struct{})
 	processPid := make(chan int)
 	go func() {
 		defer close(stopped)
-		var b bytes.Buffer
-		cmd.Stdout = &b
-		cmd.Stderr = &b
+
+		cmd.Stdout = testlog.NewTestWriter(t)
+		cmd.Stderr = testlog.NewTestWriter(t)
+
+		if opts.saveOutputAsTestArtifact {
+			authdOutput := NewSyncBuffer()
+			cmd.Stdout = io.MultiWriter(testlog.NewTestWriter(t), authdOutput)
+			cmd.Stderr = io.MultiWriter(testlog.NewTestWriter(t), authdOutput)
+			MaybeSaveBufferAsArtifactOnCleanup(t, authdOutput, "authd.log")
+		}
+
+		testlog.LogCommand(t, "Starting authd", cmd)
 		err := cmd.Start()
-		require.NoError(t, err, "Setup: daemon cannot start %v", cmd.Args)
+		require.NoError(t, err, "Setup: authd failed to start")
 		if opts.pidFile != "" {
 			processPid <- cmd.Process.Pid
 		}
 
-		// When using a shared daemon we should not use the test parameter from now on
+		// When using a shared authd instance we should not use the test parameter from now on
 		// since the test is referring to may not be the one actually running.
 		t := t
 		logger := t.Logf
@@ -202,30 +212,25 @@ paths:
 		}
 
 		err = cmd.Wait()
-		out := b.Bytes()
-		if opts.outputFile != "" {
-			logger("writing authd log files to %v", opts.outputFile)
-			if err := os.WriteFile(opts.outputFile, out, 0600); err != nil {
-				logger("TearDown: failed to save output file %q: %v", opts.outputFile, err)
-			}
-		}
-		errorIs(err, context.Canceled, "Setup: daemon stopped unexpectedly: %s", out)
+		errorIs(err, context.Canceled, "Setup: authd stopped unexpectedly")
 		if opts.pidFile != "" {
 			defer cancel(nil)
 			if err := os.Remove(opts.pidFile); err != nil {
 				logger("TearDown: failed to remove pid file %q: %v", opts.pidFile, err)
 			}
 		}
-		logger("Daemon stopped (%v)\n ##### Output #####\n %s \n ##### END #####", err, out)
+		logger("authd exited (%v)", err)
 	}()
 
 	conn, err := grpc.NewClient("unix://"+opts.socketPath, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithUnaryInterceptor(errmessages.FormatErrorMessage))
-	require.NoError(t, err, "Setup: could not connect to the daemon on %s", opts.socketPath)
+	require.NoError(t, err, "Setup: could not connect to authd on %s", opts.socketPath)
 	defer conn.Close()
 
-	// Block until the daemon is started and ready to accept connections.
+	// Block until authd has started and is ready to accept connections.
 	err = grpcutils.WaitForConnection(ctx, conn, time.Second*30)
-	require.NoError(t, err, "Setup: wait for daemon to be ready timed out")
+	require.NoError(t, err, "Setup: timeout waiting for authd to start")
+	duration := time.Since(start)
+	testlog.LogEndSeparatorf(t, "authd started in %.3fs", duration.Seconds())
 
 	if opts.pidFile != "" {
 		err := os.WriteFile(opts.pidFile, []byte(fmt.Sprint(<-processPid)), 0600)
@@ -249,8 +254,8 @@ paths:
 	return opts.socketPath, stopped
 }
 
-// BuildDaemon builds the daemon executable and returns the binary path.
-func BuildDaemon(extraArgs ...string) (execPath string, cleanup func(), err error) {
+// BuildAuthd builds the authd executable and returns the binary path.
+func BuildAuthd(extraArgs ...string) (execPath string, cleanup func(), err error) {
 	projectRoot := ProjectRoot()
 
 	tempDir, err := os.MkdirTemp("", "authd-tests-daemon")
@@ -276,9 +281,9 @@ func BuildDaemon(extraArgs ...string) (execPath string, cleanup func(), err erro
 	cmd.Args = append(cmd.Args, extraArgs...)
 	cmd.Args = append(cmd.Args, "-o", execPath, "./cmd/authd")
 
-	if out, err := cmd.CombinedOutput(); err != nil {
+	if err := testlog.RunWithTiming(nil, "Building authd", cmd); err != nil {
 		cleanup()
-		return "", nil, fmt.Errorf("failed to build daemon(%v): %s", err, out)
+		return "", nil, fmt.Errorf("failed to build authd: %v", err)
 	}
 
 	return execPath, cleanup, err
diff --git a/internal/testutils/path.go b/internal/testutils/path.go
index 1e59d1c176..30fdecb424 100644
--- a/internal/testutils/path.go
+++ b/internal/testutils/path.go
@@ -12,6 +12,9 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+// MinimalPathEnv is the minimal PATH environment variable used to run tests.
+const MinimalPathEnv = "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
 // CurrentDir returns the current file directory.
 func CurrentDir() string {
 	// p is the path to the caller file
diff --git a/internal/testutils/rust.go b/internal/testutils/rust.go
index 9845034e1a..3ceaa15090 100644
--- a/internal/testutils/rust.go
+++ b/internal/testutils/rust.go
@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/ubuntu/authd/internal/fileutils"
+	"github.com/ubuntu/authd/internal/testlog"
 )
 
 func getCargoPath() (path string, isNightly bool, err error) {
@@ -91,11 +92,14 @@ func BuildRustNSSLib(t *testing.T, disableCoverage bool, features ...string) (li
 
 	features = append([]string{"integration_tests", "custom_socket"}, features...)
 
+	t.Logf("Locking Rust target dir %s", target)
 	unlock, err := fileutils.LockDir(target)
 	require.NoError(t, err, "Setup: could not lock Rust target dir")
 	defer func() {
 		require.NoError(t, unlock(), "Setup: could not unlock Rust target dir")
+		t.Logf("Unlocked Rust target dir %s", target)
 	}()
+	t.Logf("Locked Rust target dir %s", target)
 
 	// Builds the nss library.
 	// #nosec:G204 - we control the command arguments in tests
@@ -103,17 +107,15 @@ func BuildRustNSSLib(t *testing.T, disableCoverage bool, features ...string) (li
 	if TestVerbosity() > 0 {
 		cmd.Args = append(cmd.Args, "--verbose")
 	}
+	// dpkg-buildflags sets many relevant environment variables, so we pass the whole environment.
 	cmd.Env = append(os.Environ(), rustCovEnv...)
 	cmd.Dir = projectRoot
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
 
 	if isNightly && IsAsan() {
 		cmd.Env = append(cmd.Env, "RUSTFLAGS=-Zsanitizer=address")
 	}
 
-	t.Log("Building NSS library...", cmd.Args)
-	err = cmd.Run()
+	err = testlog.RunWithTiming(t, "Building NSS library", cmd)
 	require.NoError(t, err, "Setup: could not build Rust NSS library")
 
 	// When building the crate with dh-cargo, this env is set to indicate which architecture the code
diff --git a/internal/testutils/sync.go b/internal/testutils/sync.go
new file mode 100644
index 0000000000..4fb1868373
--- /dev/null
+++ b/internal/testutils/sync.go
@@ -0,0 +1,30 @@
+package testutils
+
+import (
+	"bytes"
+	"sync"
+)
+
+// SyncBuffer is a mutex-protected buffer to avoid data races.
+type SyncBuffer struct {
+	mu  sync.Mutex
+	buf *bytes.Buffer
+}
+
+// NewSyncBuffer creates a new SyncBuffer.
+func NewSyncBuffer() *SyncBuffer {
+	return &SyncBuffer{buf: &bytes.Buffer{}}
+}
+
+func (s *SyncBuffer) Write(p []byte) (n int, err error) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.buf.Write(p)
+}
+
+// Bytes returns the buffer content.
+func (s *SyncBuffer) Bytes() []byte {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.buf.Bytes()
+}
diff --git a/log/log.go b/log/log.go
index a142243ad4..5dac22be43 100644
--- a/log/log.go
+++ b/log/log.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"log/slog"
 	"maps"
+	"os"
 	"sync"
 	"sync/atomic"
 )
@@ -20,7 +21,7 @@ type (
 )
 
 var logLevelMu = sync.RWMutex{}
-var logLevel slog.Level
+var logLevel = NoticeLevel
 
 var hasCustomOutput atomic.Pointer[io.Writer]
 
@@ -64,6 +65,10 @@ var defaultHandlers = map[Level]Handler{
 var handlers = maps.Clone(defaultHandlers)
 var handlersMu = sync.RWMutex{}
 
+func init() {
+	SetOutput(os.Stderr)
+}
+
 // GetLevel gets the standard logger level.
 func GetLevel() Level {
 	logLevelMu.RLock()
diff --git a/nss/integration-tests/integration_test.go b/nss/integration-tests/integration_test.go
index 22a2ac62a3..29d91e8b2d 100644
--- a/nss/integration-tests/integration_test.go
+++ b/nss/integration-tests/integration_test.go
@@ -30,7 +30,7 @@ func TestIntegration(t *testing.T) {
 	defaultGroupsFilePath := filepath.Join(filepath.Join("testdata", "empty.group"))
 
 	ctx, cancel := context.WithCancel(context.Background())
-	_, stopped := testutils.RunDaemon(ctx, t, daemonPath,
+	_, stopped := testutils.StartAuthd(ctx, t, daemonPath,
 		testutils.WithSocketPath(defaultSocket),
 		testutils.WithPreviousDBState(defaultDbState),
 		testutils.WithGroupFile(defaultGroupsFilePath),
@@ -115,7 +115,7 @@ func TestIntegration(t *testing.T) {
 				// Run a specific new daemon for special test cases.
 				var daemonStopped chan struct{}
 				ctx, cancel := context.WithCancel(context.Background())
-				socketPath, daemonStopped = testutils.RunDaemon(ctx, t, daemonPath,
+				socketPath, daemonStopped = testutils.StartAuthd(ctx, t, daemonPath,
 					testutils.WithPreviousDBState(tc.dbState),
 					testutils.WithGroupFile(defaultGroupsFilePath),
 				)
@@ -167,7 +167,7 @@ func TestIntegration(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	execPath, cleanup, err := testutils.BuildDaemon("-tags=withexamplebroker,integrationtests")
+	execPath, cleanup, err := testutils.BuildAuthd("-tags=withexamplebroker,integrationtests")
 	if err != nil {
 		log.Printf("Setup: failed to build daemon: %v", err)
 		os.Exit(1)
diff --git a/nss/src/lib.rs b/nss/src/lib.rs
index ff9f89bdce..7de2a2ee4e 100644
--- a/nss/src/lib.rs
+++ b/nss/src/lib.rs
@@ -30,6 +30,8 @@ const CONNECTION_TIMEOUT: Duration = Duration::from_secs(5);
 #[cfg(feature = "integration_tests")]
 const REQUEST_TIMEOUT: Duration = Duration::from_secs(10);
 
+const DEFAULT_SOCKET_PATH: &str = "/run/authd.sock";
+
 /// socket_path returns the socket path to connect to the gRPC server.
 ///
 /// It uses the AUTHD_NSS_SOCKET env value if set and the custom_socket feature is enabled,
@@ -40,12 +42,11 @@ fn socket_path() -> String {
         Ok(s) => return s,
         Err(err) => {
             info!(
-                "AUTHD_NSS_SOCKET not set or badly configured, using default value: {}",
-                err
+                "AUTHD_NSS_SOCKET env variable not set, falling back to default socket path {DEFAULT_SOCKET_PATH}: {err}"
             );
         }
     }
-    "/run/authd.sock".to_string()
+    DEFAULT_SOCKET_PATH.to_string()
 }
 
 /// grpc_status_to_nss_response converts a gRPC status to a NSS response.
diff --git a/pam/integration-tests/cli_test.go b/pam/integration-tests/cli_test.go
index 7f5c10f321..fbed74bc09 100644
--- a/pam/integration-tests/cli_test.go
+++ b/pam/integration-tests/cli_test.go
@@ -272,14 +272,14 @@ func TestCLIAuthenticate(t *testing.T) {
 				socketPath = tc.socketPath
 			}
 
-			td := newTapeData(tc.tape, tc.tapeSettings...)
+			td := newTapeData(tc.tape, outDir, tc.tapeSettings...)
 			td.Command = tapeCommand
 			td.Variables = tc.tapeVariables
 			td.Env[vhsTapeSocketVariable] = socketPath
 			td.Env["AUTHD_TEST_PID_FILE"] = pidFile
 			td.AddClientOptions(t, tc.clientOptions)
-			td.RunVhs(t, vhsTestTypeCLI, outDir, cliEnv)
-			got := td.ExpectedOutput(t, outDir)
+			td.RunVHS(t, vhsTestTypeCLI, cliEnv)
+			got := td.SanitizedOutput(t)
 			golden.CheckOrUpdate(t, got)
 
 			localgroupstestutils.RequireGroupFile(t, groupFileOutput, golden.Path(t))
@@ -392,13 +392,13 @@ func TestCLIChangeAuthTok(t *testing.T) {
 				tc.tapeVariables[vhsTapeUserVariable] = vhsTestUserName(t, "cli-passwd")
 			}
 
-			td := newTapeData(tc.tape, tc.tapeSettings...)
+			td := newTapeData(tc.tape, outDir, tc.tapeSettings...)
 			td.Command = tapeCommand
 			td.Variables = tc.tapeVariables
 			td.Env[vhsTapeSocketVariable] = socketPath
 			td.AddClientOptions(t, clientOptions{})
-			td.RunVhs(t, vhsTestTypeCLI, outDir, cliEnv)
-			got := td.ExpectedOutput(t, outDir)
+			td.RunVHS(t, vhsTestTypeCLI, cliEnv)
+			got := td.SanitizedOutput(t)
 			golden.CheckOrUpdate(t, got)
 
 			requireRunnerResult(t, authd.SessionMode_CHANGE_PASSWORD, got)
diff --git a/pam/integration-tests/exec_test.go b/pam/integration-tests/exec_test.go
index 4e9ec28a1f..efbc02fbe3 100644
--- a/pam/integration-tests/exec_test.go
+++ b/pam/integration-tests/exec_test.go
@@ -886,7 +886,7 @@ func getModuleArgs(t *testing.T, clientPath string, args []string) []string {
 			clientArgsPath := filepath.Join(t.TempDir(), "client-args-file")
 			require.NoError(t, os.WriteFile(clientArgsPath, []byte(strings.Join(args, "\t")), 0600),
 				"Setup: Creation of client args file failed")
-			saveArtifactsForDebugOnCleanup(t, []string{clientArgsPath})
+			testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, clientArgsPath)
 			return append(moduleArgs, "-client-args-file", clientArgsPath)
 		}
 	}
@@ -933,7 +933,7 @@ func preparePamTransactionForServiceFile(t *testing.T, serviceFile string, user
 	} else {
 		tx, err = pam.StartConfDir(filepath.Base(serviceFile), user, nil, filepath.Dir(serviceFile))
 	}
-	saveArtifactsForDebugOnCleanup(t, []string{serviceFile})
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, serviceFile)
 	require.NoError(t, err, "PAM: Error to initialize module")
 	require.NotNil(t, tx, "PAM: Transaction is not set")
 	t.Cleanup(func() { require.NoError(t, tx.End(), "PAM: can't end transaction") })
@@ -965,8 +965,8 @@ func buildExecModuleWithCFlags(t *testing.T, cFlags []string, forPreload bool) s
 
 	pkgConfigDeps := []string{"gio-2.0", "gio-unix-2.0"}
 	// t.Name() can be a subtest, so replace the directory slash to get a valid filename.
-	return buildCPAMModule(t, execModuleSources, pkgConfigDeps, cFlags,
-		"pam_authd_exec"+strings.ToLower(strings.ReplaceAll(t.Name(), "/", "_")),
+	return buildSharedLibrary(t, "Building PAM module", execModuleSources, pkgConfigDeps, cFlags,
+		[]string{"-lpam"}, "pam_authd_exec"+strings.ToLower(strings.ReplaceAll(t.Name(), "/", "_")),
 		forPreload)
 }
 
diff --git a/pam/integration-tests/gdm_test.go b/pam/integration-tests/gdm_test.go
index 0254107b36..d572fe938f 100644
--- a/pam/integration-tests/gdm_test.go
+++ b/pam/integration-tests/gdm_test.go
@@ -938,7 +938,7 @@ func TestGdmModule(t *testing.T) {
 			moduleArgs = append(moduleArgs, tc.moduleArgs...)
 
 			serviceFile := createServiceFile(t, "gdm-authd", libPath, moduleArgs)
-			saveArtifactsForDebugOnCleanup(t, []string{serviceFile})
+			testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, serviceFile)
 
 			pamUser := vhsTestUserName(t, "gdm")
 			if tc.pamUserPrefix != "" {
@@ -1060,7 +1060,7 @@ func TestGdmModuleAuthenticateWithoutGdmExtension(t *testing.T) {
 	moduleArgs = append(moduleArgs, "debug=true", "logfile="+gdmLog)
 
 	serviceFile := createServiceFile(t, "gdm-authd", libPath, moduleArgs)
-	saveArtifactsForDebugOnCleanup(t, []string{serviceFile})
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, serviceFile)
 	pamUser := vhsTestUserName(t, "gdm")
 	gh := newGdmTestModuleHandler(t, serviceFile, pamUser)
 	t.Cleanup(func() { require.NoError(t, gh.tx.End(), "PAM: can't end transaction") })
@@ -1094,7 +1094,7 @@ func TestGdmModuleAcctMgmtWithoutGdmExtension(t *testing.T) {
 	moduleArgs = append(moduleArgs, "debug=true", "logfile="+gdmLog)
 
 	serviceFile := createServiceFile(t, "gdm-authd", libPath, moduleArgs)
-	saveArtifactsForDebugOnCleanup(t, []string{serviceFile})
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, serviceFile)
 	pamUser := vhsTestUserName(t, "gdm")
 	gh := newGdmTestModuleHandler(t, serviceFile, pamUser)
 	t.Cleanup(func() { require.NoError(t, gh.tx.End(), "PAM: can't end transaction") })
diff --git a/pam/integration-tests/helpers_test.go b/pam/integration-tests/helpers_test.go
index 2f22577f6b..fcf0c34dec 100644
--- a/pam/integration-tests/helpers_test.go
+++ b/pam/integration-tests/helpers_test.go
@@ -2,6 +2,7 @@ package main_test
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io/fs"
@@ -21,8 +22,8 @@ import (
 	"github.com/ubuntu/authd/internal/grpcutils"
 	"github.com/ubuntu/authd/internal/proto/authd"
 	"github.com/ubuntu/authd/internal/services/errmessages"
+	"github.com/ubuntu/authd/internal/testlog"
 	"github.com/ubuntu/authd/internal/testutils"
-	"github.com/ubuntu/authd/internal/testutils/golden"
 	"github.com/ubuntu/authd/internal/users/db/bbolt"
 	"github.com/ubuntu/authd/pam/internal/pam_test"
 	"google.golang.org/grpc"
@@ -30,13 +31,6 @@ import (
 	"gorbe.io/go/osrelease"
 )
 
-var (
-	authdTestSessionTime     = time.Now()
-	authdArtifactsDir        string
-	authdArtifactsAlwaysSave bool
-	authdArtifactsDirSync    sync.Once
-)
-
 type authdInstance struct {
 	mu               sync.Mutex
 	refCount         uint64
@@ -62,8 +56,7 @@ func runAuthdForTesting(t *testing.T, currentUserAsRoot bool, isSharedDaemon boo
 	}
 	args = append(args, testutils.WithEnvironment(env...))
 
-	outputFile := filepath.Join(t.TempDir(), "authd.log")
-	args = append(args, testutils.WithOutputFile(outputFile))
+	args = append(args, testutils.WithOutputAsTestArtifact())
 
 	homeBaseDir := filepath.Join(t.TempDir(), "homes")
 	err := os.MkdirAll(homeBaseDir, 0700)
@@ -73,15 +66,14 @@ func runAuthdForTesting(t *testing.T, currentUserAsRoot bool, isSharedDaemon boo
 	if !isSharedDaemon {
 		database := filepath.Join(t.TempDir(), "db", consts.DefaultDatabaseFileName)
 		args = append(args, testutils.WithDBPath(filepath.Dir(database)))
-		saveArtifactsForDebugOnCleanup(t, []string{database})
+		testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, database)
 	}
-	if isSharedDaemon && authdArtifactsAlwaysSave {
-		database := filepath.Join(authdArtifactsDir, "db", consts.DefaultDatabaseFileName)
+	if isSharedDaemon && os.Getenv("AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE") != "" {
+		database := filepath.Join(testutils.ArtifactsDir(t), "db", consts.DefaultDatabaseFileName)
 		args = append(args, testutils.WithDBPath(filepath.Dir(database)))
 	}
 
-	socketPath, stopped := testutils.RunDaemon(ctx, t, daemonPath, args...)
-	saveArtifactsForDebugOnCleanup(t, []string{outputFile})
+	socketPath, stopped := testutils.StartAuthd(ctx, t, daemonPath, args...)
 	return socketPath, func() {
 		cancel()
 		<-stopped
@@ -218,15 +210,13 @@ func buildPAMExecChild(t *testing.T) string {
 	}
 	cmd.Args = append(cmd.Args, "-gcflags=all=-N -l")
 	cmd.Args = append(cmd.Args, "-tags=pam_debug")
-	cmd.Env = append(os.Environ(), `CGO_CFLAGS=-O0 -g3`)
+	cmd.Env = append(goEnv(t), testutils.MinimalPathEnv, "CGO_CFLAGS=-O0 -g3")
 
 	authdPam := filepath.Join(t.TempDir(), "authd-pam")
-	t.Logf("Compiling Exec child at %s", authdPam)
-	t.Log(strings.Join(cmd.Args, " "))
 
 	cmd.Args = append(cmd.Args, "-o", authdPam)
-	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, "Setup: could not compile PAM exec child: %s", out)
+	err := testlog.RunWithTiming(t, "Building PAM exec child", cmd)
+	require.NoError(t, err, "Setup: Failed to build PAM exec child")
 
 	return authdPam
 }
@@ -235,7 +225,7 @@ func prepareFileLogging(t *testing.T, fileName string) string {
 	t.Helper()
 
 	cliLog := filepath.Join(t.TempDir(), fileName)
-	saveArtifactsForDebugOnCleanup(t, []string{cliLog})
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, cliLog)
 	t.Cleanup(func() {
 		out, err := os.ReadFile(cliLog)
 		if errors.Is(err, fs.ErrNotExist) {
@@ -271,79 +261,46 @@ func requirePreviousBrokerForUser(t *testing.T, socketPath string, brokerName st
 	require.Equal(t, prevBroker.PreviousBroker, prevBrokerID)
 }
 
-func artifactsPath(t *testing.T) string {
-	t.Helper()
-
-	authdArtifactsDirSync.Do(func() {
-		defer func() { t.Logf("Saving test artifacts at %s", authdArtifactsDir) }()
-
-		authdArtifactsAlwaysSave = os.Getenv("AUTHD_TESTS_ARTIFACTS_ALWAYS_SAVE") != ""
-
-		// We need to copy the artifacts to another directory, since the test directory will be cleaned up.
-		authdArtifactsDir = os.Getenv("AUTHD_TESTS_ARTIFACTS_PATH")
-		if authdArtifactsDir != "" {
-			if err := os.MkdirAll(authdArtifactsDir, 0750); err != nil && !os.IsExist(err) {
-				require.NoError(t, err, "TearDown: could not create artifacts directory %q", authdArtifactsDir)
-			}
-			return
-		}
-
-		st := authdTestSessionTime
-		folderName := fmt.Sprintf("authd-test-artifacts-%d-%02d-%02dT%02d:%02d:%02d.%d-",
-			st.Year(), st.Month(), st.Day(), st.Hour(), st.Minute(), st.Second(),
-			st.UnixMilli())
-
-		var err error
-		authdArtifactsDir, err = os.MkdirTemp(os.TempDir(), folderName)
-		require.NoError(t, err, "TearDown: could not create artifacts directory %q", authdArtifactsDir)
-	})
-
-	return authdArtifactsDir
+func sleepDuration(in time.Duration) time.Duration {
+	return testutils.MultipliedSleepDuration(in)
 }
 
-// saveArtifactsForDebug saves the specified artifacts to a temporary directory if the test failed.
-func saveArtifactsForDebug(t *testing.T, artifacts []string) {
+// pathEnvWithGoBin returns the value of the GOPATH defined in go env prepended to PATH.
+func pathEnvWithGoBin(t *testing.T) string {
 	t.Helper()
-	if !t.Failed() && !authdArtifactsAlwaysSave {
-		return
-	}
 
-	tmpDir := filepath.Join(artifactsPath(t), golden.Path(t))
-	err := os.MkdirAll(tmpDir, 0750)
-	require.NoError(t, err, "TearDown: could not create temporary directory %q for artifacts", tmpDir)
+	pathEnv := testutils.MinimalPathEnv
 
-	// Copy the artifacts to the temporary directory.
-	for _, artifact := range artifacts {
-		content, err := os.ReadFile(artifact)
-		if err != nil {
-			t.Logf("Could not read artifact %q: %v", artifact, err)
-			continue
-		}
-		if err := os.WriteFile(filepath.Join(tmpDir, filepath.Base(artifact)), content, 0600); err != nil {
-			t.Logf("Could not write artifact %q: %v", artifact, err)
-		}
-	}
-}
+	cmd := exec.Command("go", "env", "GOPATH")
+	out, err := cmd.CombinedOutput()
+	require.NoError(t, err, "Could not get GOPATH: %v: %s", err, out)
 
-func saveArtifactsForDebugOnCleanup(t *testing.T, artifacts []string) {
-	t.Helper()
-	t.Cleanup(func() { saveArtifactsForDebug(t, artifacts) })
-}
+	goPath := strings.TrimSpace(string(out))
 
-func sleepDuration(in time.Duration) time.Duration {
-	return testutils.MultipliedSleepDuration(in)
+	if goPath == "" {
+		return pathEnv
+	}
+
+	goBinPath := filepath.Join(goPath, "bin")
+	return fmt.Sprintf("PATH=%s:%s", goBinPath, strings.TrimPrefix(pathEnv, "PATH="))
 }
 
-// prependBinToPath returns the value of the GOPATH defined in go env prepended to PATH.
-func prependBinToPath(t *testing.T) string {
+func goEnv(t *testing.T) []string {
 	t.Helper()
 
-	cmd := exec.Command("go", "env", "GOPATH")
+	cmd := exec.Command("go", "env", "-json")
 	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, "Could not get GOPATH: %v: %s", err, out)
+	require.NoError(t, err, "Could not get go env: %v: %s", err, out)
 
-	env := os.Getenv("PATH")
-	return "PATH=" + strings.Join([]string{filepath.Join(strings.TrimSpace(string(out)), "bin"), env}, ":")
+	var env map[string]string
+	err = json.Unmarshal(out, &env)
+	require.NoError(t, err, "Could not unmarshal go env: %v: %s", err, out)
+
+	var envSlice []string
+	for k, v := range env {
+		envSlice = append(envSlice, fmt.Sprintf("%s=%s", k, v))
+	}
+	return envSlice
 }
 
 func prepareGroupFiles(t *testing.T) (string, string) {
@@ -366,7 +323,7 @@ func prepareGroupFiles(t *testing.T) (string, string) {
 	require.NoError(t, err, "Cannot copy the group file %q", groupsFile)
 	groupsFile = tmpCopy
 
-	saveArtifactsForDebugOnCleanup(t, []string{groupOutputFile, groupsFile})
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, groupOutputFile, groupsFile)
 
 	return groupOutputFile, groupsFile
 }
@@ -486,7 +443,7 @@ func getEntOutput(t *testing.T, nssLibrary, authdSocket, db, key string) string
 	cmd.Env = nssTestEnv(t, nssLibrary, authdSocket)
 
 	out, err := cmd.Output()
-	require.NoError(t, err, "getent %s should not fail for key %q\n%s", db, key)
+	require.NoError(t, err, "getent %s should not fail for key %q\n%s", db, key, string(out))
 
 	o := strings.TrimSpace(string(out))
 	t.Log(strings.Join(cmd.Args, " "), "returned:", o)
diff --git a/pam/integration-tests/integration_test.go b/pam/integration-tests/integration_test.go
index 7b0fd25e92..193fec3b96 100644
--- a/pam/integration-tests/integration_test.go
+++ b/pam/integration-tests/integration_test.go
@@ -13,7 +13,7 @@ const authdCurrentUserRootEnvVariableContent = "AUTHD_INTEGRATIONTESTS_CURRENT_U
 var daemonPath string
 
 func TestMain(m *testing.M) {
-	execPath, daemonCleanup, err := testutils.BuildDaemon("-tags=withexamplebroker,integrationtests")
+	execPath, daemonCleanup, err := testutils.BuildAuthd("-tags=withexamplebroker,integrationtests")
 	if err != nil {
 		log.Printf("Setup: Failed to build authd daemon: %v", err)
 		os.Exit(1)
diff --git a/pam/integration-tests/modulehelpers_test.go b/pam/integration-tests/modulehelpers_test.go
index 57b8d691df..81d45af620 100644
--- a/pam/integration-tests/modulehelpers_test.go
+++ b/pam/integration-tests/modulehelpers_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"github.com/ubuntu/authd/internal/testlog"
 	"github.com/ubuntu/authd/internal/testutils"
 	"github.com/ubuntu/authd/pam/internal/pam_test"
 )
@@ -20,7 +21,7 @@ func getPkgConfigFlags(t *testing.T, args []string) []string {
 	return strings.Split(strings.TrimSpace(string(out)), " ")
 }
 
-func buildCModule(t *testing.T, sources []string, pkgConfigDeps []string, cFlags []string, ldFlags []string, soname string, forPreload bool) string {
+func buildSharedLibrary(t *testing.T, logMsg string, sources []string, pkgConfigDeps []string, cFlags []string, ldFlags []string, soname string, forPreload bool) string {
 	t.Helper()
 
 	compiler := os.Getenv("CC")
@@ -35,7 +36,6 @@ func buildCModule(t *testing.T, sources []string, pkgConfigDeps []string, cFlags
 
 	require.NoError(t, os.MkdirAll(filepath.Dir(libPath), 0700),
 		"Setup: Can't create loader build path")
-	t.Logf("Compiling C Module library at %s", libPath)
 	cmd.Args = append(cmd.Args, "-o", libPath)
 	cmd.Args = append(cmd.Args, sources...)
 	cmd.Args = append(cmd.Args,
@@ -93,18 +93,15 @@ func buildCModule(t *testing.T, sources []string, pkgConfigDeps []string, cFlags
 		require.NoError(t, err, "TearDown: Impossible to create path %q", gcovDir)
 
 		t.Cleanup(func() {
-			t.Log("Running gcov...")
 			gcov := exec.Command("gcov")
 			gcov.Args = append(gcov.Args,
 				"-pb", "-o", libDir,
 				notesFilename)
 			gcov.Dir = gcovDir
-			out, err := gcov.CombinedOutput()
+			err := testlog.RunWithTiming(t, "Running gcov", gcov,
+				testlog.OnlyPrintStdoutAndStderrOnError())
 			require.NoError(t, err,
-				"Teardown: Can't get coverage report on C library: %s", out)
-			if string(out) != "" {
-				t.Log(string(out))
-			}
+				"Teardown: Can't get coverage report on C library")
 
 			// Also keep track of notes and data files as they're useful to generate
 			// an html output locally using geninfo + genhtml.
@@ -119,21 +116,12 @@ func buildCModule(t *testing.T, sources []string, pkgConfigDeps []string, cFlags
 		})
 	}
 
-	t.Logf("Running compiler command: %s %s", cmd.Path, strings.Join(cmd.Args[1:], " "))
-	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, "Setup: could not compile C module %s: %s", soname, out)
-	if string(out) != "" {
-		t.Log(string(out))
-	}
+	err := testlog.RunWithTiming(t, logMsg, cmd)
+	require.NoError(t, err, "Setup: Failed to build PAM module")
 
 	return libPath
 }
 
-func buildCPAMModule(t *testing.T, sources []string, pkgConfigDeps []string, cFlags []string, soname string, forPreload bool) string {
-	t.Helper()
-	return buildCModule(t, sources, pkgConfigDeps, cFlags, []string{"-lpam"}, soname, forPreload)
-}
-
 type actionArgsMap = map[pam_test.Action][]string
 
 func createServiceFile(t *testing.T, name string, libPath string, args []string) string {
diff --git a/pam/integration-tests/native_test.go b/pam/integration-tests/native_test.go
index 1c57232c91..eaa69fdbf9 100644
--- a/pam/integration-tests/native_test.go
+++ b/pam/integration-tests/native_test.go
@@ -450,15 +450,15 @@ func TestNativeAuthenticate(t *testing.T) {
 				tc.clientOptions.PamUser = vhsTestUserName(t, "native")
 			}
 
-			td := newTapeData(tc.tape, tc.tapeSettings...)
+			td := newTapeData(tc.tape, outDir, tc.tapeSettings...)
 			td.Command = tc.tapeCommand
 			td.Env[vhsTapeSocketVariable] = socketPath
 			td.Env[pam_test.RunnerEnvSupportsConversation] = "1"
 			td.Env["AUTHD_TEST_PID_FILE"] = pidFile
 			td.Variables = tc.tapeVariables
 			td.AddClientOptions(t, tc.clientOptions)
-			td.RunVhs(t, vhsTestTypeNative, outDir, cliEnv)
-			got := td.ExpectedOutput(t, outDir)
+			td.RunVHS(t, vhsTestTypeNative, cliEnv)
+			got := td.SanitizedOutput(t)
 			golden.CheckOrUpdate(t, got)
 
 			localgroupstestutils.RequireGroupFile(t, groupFileOutput, golden.Path(t))
@@ -590,14 +590,14 @@ func TestNativeChangeAuthTok(t *testing.T) {
 				tc.tapeVariables[vhsTapeUserVariable] = vhsTestUserName(t, "native-passwd")
 			}
 
-			td := newTapeData(tc.tape, tc.tapeSettings...)
+			td := newTapeData(tc.tape, outDir, tc.tapeSettings...)
 			td.Command = tapeCommand
 			td.Variables = tc.tapeVariables
 			td.Env[vhsTapeSocketVariable] = socketPath
 			td.Env[pam_test.RunnerEnvSupportsConversation] = "1"
 			td.AddClientOptions(t, tc.clientOptions)
-			td.RunVhs(t, vhsTestTypeNative, outDir, cliEnv)
-			got := td.ExpectedOutput(t, outDir)
+			td.RunVHS(t, vhsTestTypeNative, cliEnv)
+			got := td.SanitizedOutput(t)
 			golden.CheckOrUpdate(t, got)
 
 			if !tc.skipRunnerCheck {
diff --git a/pam/integration-tests/ssh_test.go b/pam/integration-tests/ssh_test.go
index 3329ddd3a2..74a22df94f 100644
--- a/pam/integration-tests/ssh_test.go
+++ b/pam/integration-tests/ssh_test.go
@@ -1,10 +1,10 @@
 package main_test
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -26,6 +26,7 @@ import (
 	"github.com/ubuntu/authd/internal/grpcutils"
 	"github.com/ubuntu/authd/internal/proto/authd"
 	"github.com/ubuntu/authd/internal/services/errmessages"
+	"github.com/ubuntu/authd/internal/testlog"
 	"github.com/ubuntu/authd/internal/testutils"
 	"github.com/ubuntu/authd/internal/testutils/golden"
 	localgroupstestutils "github.com/ubuntu/authd/internal/users/localentries/testutils"
@@ -40,18 +41,20 @@ var (
 
 	sshDefaultFinalWaitTimeout = sleepDuration(3 * defaultSleepValues[authdWaitDefault])
 
-	buildExecModuleOnce sync.Once
-	execModule          string
+	prepareSSHTestsOnce sync.Once
+	sshTestsPrepared    bool
 
-	buildExecChildOnce sync.Once
-	execChild          string
+	prepareSharedSSHDTestsOnce sync.Once
+	sharedSSHDTestsPrepared    bool
 
-	buildNSSLibOnce sync.Once
-	nssEnv          []string
-	nssLibrary      string
-
-	buildCModuleOnce   sync.Once
-	sshdPreloadLibrary string
+	execModule, execChild, pamMkHomeDirModule string
+	nssEnv                                    []string
+	nssLibrary                                string
+	sshdPreloadLibraries                      []string
+	sshdPreloaderCFlags                       []string
+	sshdEnv                                   []string
+	sshdHostKeyPath                           string
+	sshdHostPubKey                            []byte
 )
 
 func TestSSHAuthenticate(t *testing.T) {
@@ -69,7 +72,7 @@ func TestSSHAuthenticate(t *testing.T) {
 }
 
 //nolint:thelper // This is actually a test function!
-func testSSHAuthenticate(t *testing.T, sharedSSHd bool) {
+func testSSHAuthenticate(t *testing.T, sharedSSHD bool) {
 	// Due to external dependencies such as `vhs`, we can't run the tests in some environments (like LP builders), as we
 	// can't install the dependencies there. So we need to be able to skip these tests on-demand.
 	if os.Getenv("AUTHD_SKIP_EXTERNAL_DEPENDENT_TESTS") != "" {
@@ -85,72 +88,80 @@ func testSSHAuthenticate(t *testing.T, sharedSSHd bool) {
 	currentDir, err := os.Getwd()
 	require.NoError(t, err, "Setup: Could not get current directory for the tests")
 
-	buildExecModuleOnce.Do(func() {
-		execModule = buildExecModuleWithCFlags(t, []string{"-std=c11"}, true)
-	})
+	prepareSSHTests := func(subtest *testing.T) {
+		t.Logf("Preparing SSH tests, triggered by %q", subtest.Name())
 
-	buildExecChildOnce.Do(func() {
+		execModule = buildExecModuleWithCFlags(t, []string{"-std=c11"}, true)
 		execChild = buildPAMExecChild(t)
-	})
 
-	mkHomeDirHelper, err := exec.LookPath("mkhomedir_helper")
-	require.NoError(t, err, "Setup: mkhomedir_helper not found")
-	pamMkHomeDirModule := buildCPAMModule(t,
-		[]string{"./pam/integration-tests/pam_mkhomedir/pam_mkhomedir.c"},
-		nil,
-		[]string{
-			"-DAUTHD_TESTS_SSH_USE_AUTHD_NSS",
-			fmt.Sprintf("-DMKHOMEDIR_HELPER=%q", mkHomeDirHelper),
-		},
-		"pam_mkhomedir_test.so", true)
-
-	var sshdPreloadLibraries []string
-	var sshdPreloaderCFlags []string
-	if os.Getenv("AUTHD_TESTS_SSH_USE_DUMMY_NSS") == "" && err == nil {
-		buildNSSLibOnce.Do(func() {
+		mkHomeDirHelper, err := exec.LookPath("mkhomedir_helper")
+		require.NoError(t, err, "Setup: mkhomedir_helper not found")
+		pamMkHomeDirModule = buildSharedLibrary(t,
+			"Building pam_mkhomedir module",
+			[]string{"./pam/integration-tests/pam_mkhomedir/pam_mkhomedir.c"},
+			nil,
+			[]string{
+				"-DAUTHD_TESTS_SSH_USE_AUTHD_NSS",
+				fmt.Sprintf("-DMKHOMEDIR_HELPER=%q", mkHomeDirHelper),
+			},
+			[]string{"-lpam"},
+			"pam_mkhomedir_test.so", true)
+
+		err = testutils.CanRunRustTests(false)
+		if os.Getenv("AUTHD_TESTS_SSH_USE_DUMMY_NSS") == "" && err == nil {
 			nssLibrary, nssEnv = testutils.BuildRustNSSLib(t, true)
-		})
-		sshdPreloadLibraries = append(sshdPreloadLibraries, nssLibrary)
-		sshdPreloaderCFlags = append(sshdPreloaderCFlags,
-			"-DAUTHD_TESTS_SSH_USE_AUTHD_NSS")
-		nssEnv = append(nssEnv, nssTestEnvBase(t, nssLibrary)...)
-	} else if err != nil {
-		t.Logf("Using the dummy library to implement NSS: %v", err)
+			sshdPreloadLibraries = append(sshdPreloadLibraries, nssLibrary)
+			sshdPreloaderCFlags = append(sshdPreloaderCFlags,
+				"-DAUTHD_TESTS_SSH_USE_AUTHD_NSS")
+			nssEnv = append(nssEnv, nssTestEnvBase(t, nssLibrary)...)
+		} else if err != nil {
+			t.Logf("Using the dummy library to implement NSS: %v", err)
+		}
+
+		sources := []string{filepath.Join(currentDir, "/sshd_preloader/sshd_preloader.c")}
+		sshdPreloadLibrary := buildSharedLibrary(t, "Building sshd_preloader library", sources,
+			nil, sshdPreloaderCFlags, nil, "sshd_preloader", true)
+		sshdPreloadLibraries = append(sshdPreloadLibraries, sshdPreloadLibrary)
+
+		sshdHostKeyPath = filepath.Join(t.TempDir(), "ssh_host_ed25519_key")
+		//#nosec:G204 - we control the command arguments in tests
+		out, err := exec.Command("ssh-keygen", "-q", "-f", sshdHostKeyPath, "-N", "", "-t", "ed25519").CombinedOutput()
+		require.NoError(t, err, "Setup: Failed generating SSH host key: %s", out)
+		testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, sshdHostKeyPath)
+
+		sshdHostPubKey, err = os.ReadFile(sshdHostKeyPath + ".pub")
+		require.NoError(t, err, "Setup: Can't read sshd host public key")
+
+		testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, sshdHostKeyPath+".pub")
+
+		if !t.Failed() {
+			t.Log("Prepared SSH tests")
+			sshTestsPrepared = true
+		}
 	}
 
-	buildCModuleOnce.Do(func() {
-		sshdPreloadLibrary = buildCModule(t, []string{
-			filepath.Join(currentDir, "/sshd_preloader/sshd_preloader.c"),
-		}, nil, sshdPreloaderCFlags, nil, "sshd_preloader", true)
-	})
-	sshdPreloadLibraries = append(sshdPreloadLibraries, sshdPreloadLibrary)
+	var sharedSSHDPort, sharedSSHDUserHome, sharedAuthdSocket, sharedAuthdGroupOutput string
+	prepareSharedSSHDTests := func(subtest *testing.T) {
+		t.Logf("Preparing SSH tests with shared sshd, triggered by %q", subtest.Name())
+		sharedAuthdSocket, sharedAuthdGroupOutput = sharedAuthd(t)
+		serviceFile := createSSHDServiceFile(t, execModule, execChild, pamMkHomeDirModule, sharedAuthdSocket)
+		sshdEnv = append(sshdEnv, nssEnv...)
+		sshdEnv = append(sshdEnv, fmt.Sprintf("AUTHD_NSS_SOCKET=%s", sharedAuthdSocket))
 
-	sshdHostKey := filepath.Join(t.TempDir(), "ssh_host_ed25519_key")
-	//#nosec:G204 - we control the command arguments in tests
-	out, err := exec.Command("ssh-keygen", "-q", "-f", sshdHostKey, "-N", "", "-t", "ed25519").CombinedOutput()
-	require.NoError(t, err, "Setup: Failed generating SSH host key: %s", out)
-	saveArtifactsForDebugOnCleanup(t, []string{sshdHostKey})
+		sharedSSHDPort, sharedSSHDUserHome = startSSHDForTest(t, serviceFile, sshdHostKeyPath,
+			"authd-test-user-sshd-accept-all", sshdPreloadLibraries, sshdEnv, false)
 
-	pubKey, err := os.ReadFile(sshdHostKey + ".pub")
-	require.NoError(t, err, "Setup: Can't read sshd host public key")
-	saveArtifactsForDebugOnCleanup(t, []string{sshdHostKey + ".pub"})
+		if !t.Failed() {
+			t.Log("Prepared SSH tests with shared sshd")
+			sharedSSHDTestsPrepared = true
+		}
+	}
 
 	const pamSSHUserEnv = "AUTHD_PAM_SSH_USER"
 	const baseTapeCommand = "ssh ${%s}@localhost ${AUTHD_PAM_SSH_ARGS}"
 	tapeCommand := fmt.Sprintf(baseTapeCommand, pamSSHUserEnv)
 	defaultTapeSettings := []tapeSetting{{vhsHeight, 1000}, {vhsWidth, 1500}}
 
-	var sshdEnv []string
-	var defaultSSHDPort, defaultUserHome, defaultSocketPath, defaultGroupOutput string
-	if sharedSSHd {
-		defaultSocketPath, defaultGroupOutput = sharedAuthd(t)
-		serviceFile := createSshdServiceFile(t, execModule, execChild, pamMkHomeDirModule, defaultSocketPath)
-		sshdEnv = append(sshdEnv, nssEnv...)
-		sshdEnv = append(sshdEnv, fmt.Sprintf("AUTHD_NSS_SOCKET=%s", defaultSocketPath))
-		defaultSSHDPort, defaultUserHome = startSSHdForTest(t, serviceFile, sshdHostKey,
-			"authd-test-user-sshd-accept-all", sshdPreloadLibraries, sshdEnv, true, false)
-	}
-
 	sshEnvVariablesRegex = regexp.MustCompile(`(?m)  (PATH|HOME|PWD|SSH_[A-Z]+)=.*(\n*)($[^ ]{2}.*)?$`)
 	sshHostPortRegex = regexp.MustCompile(`([\d\.:]+) port ([\d:]+)`)
 
@@ -164,7 +175,6 @@ func testSSHAuthenticate(t *testing.T, sharedSSHd bool) {
 		userPrefix       string
 		pamServiceName   string
 		socketPath       string
-		daemonizeSSHd    bool
 		interactiveShell bool
 		oldDB            string
 
@@ -239,7 +249,6 @@ func testSSHAuthenticate(t *testing.T, sharedSSHd bool) {
 			user: strings.ToUpper(vhsTestUserNameFull(t,
 				examplebroker.UserIntegrationNeedsResetPrefix+
 					examplebroker.UserIntegrationPreCheckValue, "case-insensitive")),
-			daemonizeSSHd: true,
 			tapeVariables: map[string]string{
 				"AUTHD_TEST_TAPE_SSH_USER_VAR": pamSSHUserEnv,
 				"AUTHD_TEST_TAPE_LOWER_CASE_USERNAME": vhsTestUserNameFull(t,
@@ -298,8 +307,7 @@ func testSSHAuthenticate(t *testing.T, sharedSSHd bool) {
 		},
 
 		"Remember_last_successful_broker_and_mode": {
-			tape:          "remember_broker_and_mode",
-			daemonizeSSHd: true,
+			tape: "remember_broker_and_mode",
 		},
 		"Autoselect_local_broker_for_local_user": {
 			tape:                "local_user_preset",
@@ -374,14 +382,34 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
 		},
 	}
 	for name, tc := range tests {
-		if sharedSSHd {
-			name = fmt.Sprintf("%s on shared SSHd", name)
+		if sharedSSHD {
+			name = fmt.Sprintf("%s_with_shared_sshd", name)
 		}
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			socketPath := defaultSocketPath
-			groupOutput := defaultGroupOutput
+			if !sshTestsPrepared {
+				t.Log("Waiting for SSH tests to be prepared")
+				start := time.Now()
+				prepareSSHTestsOnce.Do(func() {
+					prepareSSHTests(t)
+				})
+				require.True(t, sshTestsPrepared, "Setup: preparing SSH tests failed")
+				t.Logf("SSH tests prepared after %.3fs", time.Since(start).Seconds())
+			}
+
+			if sharedSSHD && !sharedSSHDTestsPrepared {
+				t.Log("Waiting for shared SSHD tests to be prepared")
+				start := time.Now()
+				prepareSharedSSHDTestsOnce.Do(func() {
+					prepareSharedSSHDTests(t)
+				})
+				require.True(t, sharedSSHDTestsPrepared, "Setup: creating shared sshd service file failed")
+				t.Logf("Shared SSHD tests prepared after %.3fs", time.Since(start).Seconds())
+			}
+
+			socketPath := sharedAuthdSocket
+			groupOutput := sharedAuthdGroupOutput
 
 			var authdEnv []string
 			var authdSocketLink string
@@ -411,9 +439,9 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
 				socketPath = runAuthd(t, true,
 					testutils.WithGroupFile(groupOutput),
 					testutils.WithEnvironment(authdEnv...))
-			} else if !sharedSSHd {
+			} else if !sharedSSHD {
 				socketPath, groupOutput = sharedAuthd(t,
-					testutils.WithGroupFileOutput(defaultGroupOutput),
+					testutils.WithGroupFileOutput(sharedAuthdGroupOutput),
 					testutils.WithEnvironment(authdEnv...))
 			}
 			if tc.socketPath != "" {
@@ -451,9 +479,9 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
 				}
 			}
 
-			sshdPort := defaultSSHDPort
-			userHome := defaultUserHome
-			if !sharedSSHd || tc.wantLocalGroups || tc.oldDB != "" ||
+			sshdPort := sharedSSHDPort
+			userHome := sharedSSHDUserHome
+			if !sharedSSHD || tc.wantLocalGroups || tc.oldDB != "" ||
 				tc.interactiveShell || tc.socketPath != "" {
 				sshdEnv := sshdEnv
 				if nssLibrary != "" {
@@ -465,25 +493,25 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
 					err := os.Symlink(socketPath, authdSocketLink)
 					require.NoError(t, err, "Setup: symlinking the authd socket")
 				}
-				serviceFile := createSshdServiceFile(t, execModule, execChild,
+				serviceFile := createSSHDServiceFile(t, execModule, execChild,
 					pamMkHomeDirModule, socketPath)
-				sshdPort, userHome = startSSHdForTest(t, serviceFile, sshdHostKey, user,
-					sshdPreloadLibraries, sshdEnv, tc.daemonizeSSHd, tc.interactiveShell)
+				sshdPort, userHome = startSSHDForTest(t, serviceFile, sshdHostKeyPath, user,
+					sshdPreloadLibraries, sshdEnv, tc.interactiveShell)
 			}
 
-			if !sharedSSHd {
+			if !sharedSSHD {
 				_, err := os.Stat(userHome)
 				require.ErrorIs(t, err, os.ErrNotExist, "Unexpected error checking for %q", userHome)
 			}
 
 			knownHost := filepath.Join(t.TempDir(), "known_hosts")
 			err := os.WriteFile(knownHost, []byte(
-				fmt.Sprintf("[localhost]:%s %s", sshdPort, pubKey),
+				fmt.Sprintf("[localhost]:%s %s", sshdPort, sshdHostPubKey),
 			), 0600)
 			require.NoError(t, err, "Setup: can't create known hosts file")
 
 			outDir := t.TempDir()
-			td := newTapeData(tc.tape, append(defaultTapeSettings, tc.tapeSettings...)...)
+			td := newTapeData(tc.tape, outDir, append(defaultTapeSettings, tc.tapeSettings...)...)
 			td.Command = tapeCommand
 			td.Env[pam_test.RunnerEnvSupportsConversation] = "1"
 			td.Env[pamSSHUserEnv] = user
@@ -497,13 +525,16 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
 				"-o", "UserKnownHostsFile=" + knownHost,
 			}, " ")
 			td.Variables = tc.tapeVariables
-			td.RunVhs(t, vhsTestTypeSSH, outDir, nil)
-			got := sanitizeGoldenFile(t, td, outDir)
-			golden.CheckOrUpdate(t, got)
+			td.RunVHS(t, vhsTestTypeSSH, nil)
+			output := sanitizedOutput(t, td)
+			golden.CheckOrUpdate(t, output)
 
 			userEnv := fmt.Sprintf("USER=%s", strings.ToLower(user))
 			if tc.wantNotLoggedInUser {
-				require.NotContains(t, got, userEnv, "Should not have a logged in user")
+				if strings.Contains(output, userEnv) {
+					require.Fail(t, "Tape output should not contain the logged in user name",
+						fmt.Sprintf("##### Tape output #####\n%s\n##### End of tape output #####\n", output))
+				}
 
 				if userClient != nil {
 					requireNoAuthdUser(t, userClient, user)
@@ -512,7 +543,10 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
 					requireGetEntExists(t, nssLibrary, socketPath, user, tc.isLocalUser)
 				}
 			} else {
-				require.Contains(t, got, userEnv, "Logged in user does not matches")
+				if !strings.Contains(output, userEnv) {
+					require.Fail(t, "Tape output should contain the logged in user name",
+						fmt.Sprintf("##### Tape output:\n%s\n##### End of tape output #####\n", output))
+				}
 
 				if userClient != nil {
 					authdUser := requireAuthdUser(t, userClient, user)
@@ -541,18 +575,18 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
 	}
 }
 
-func sanitizeGoldenFile(t *testing.T, td tapeData, outDir string) string {
+func sanitizedOutput(t *testing.T, td *tapeData) string {
 	t.Helper()
 
-	golden := td.ExpectedOutput(t, outDir)
+	output := td.SanitizedOutput(t)
 
 	// When sshd is in debug mode, it shows the environment variables, so let's sanitize them
-	golden = sshEnvVariablesRegex.ReplaceAllString(golden, "  $1=$${AUTHD_TEST_$1}")
+	output = sshEnvVariablesRegex.ReplaceAllString(output, "  $1=$${AUTHD_TEST_$1}")
 
-	return sshHostPortRegex.ReplaceAllLiteralString(golden, "${SSH_HOST} port ${SSH_PORT}")
+	return sshHostPortRegex.ReplaceAllLiteralString(output, "${SSH_HOST} port ${SSH_PORT}")
 }
 
-func createSshdServiceFile(t *testing.T, module, execChild, mkHomeModule, socketPath string) string {
+func createSSHDServiceFile(t *testing.T, module, execChild, mkHomeModule, socketPath string) string {
 	t.Helper()
 
 	moduleArgs := []string{
@@ -604,63 +638,48 @@ func createSshdServiceFile(t *testing.T, module, execChild, mkHomeModule, socket
 		{Action: pam_test.Session, Control: pam_test.Requisite, Module: pam_test.Permit.String()},
 	})
 	require.NoError(t, err, "Setup: Creation of service file %s", pamServiceName)
-	saveArtifactsForDebugOnCleanup(t, []string{serviceFile})
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, serviceFile)
 
 	return serviceFile
 }
 
-func startSSHdForTest(t *testing.T, serviceFile, hostKey, user string, preloadLibraries []string, env []string, daemonize bool, interactiveShell bool) (string, string) {
+func startSSHDForTest(t *testing.T, serviceFile, hostKey, user string, preloadLibraries []string, env []string, interactiveShell bool) (string, string) {
 	t.Helper()
 
 	sshdConnectCommand := fmt.Sprintf(
-		"/usr/bin/echo ' SSHD: Connected to ssh via authd module! [%s]'",
+		"/usr/bin/echo ' SSHD: Connected to ssh via authd module! [%s]' && env | sort | sed 's/^/  /'",
 		t.Name())
-	if daemonize {
-		// When in daemon mode SSH doesn't show debug infos, so let's
-		// handle this manually.
-		sshdConnectCommand += "&& env | sort | sed 's/^/  /'"
-	}
 	if interactiveShell {
-		sshdConnectCommand = "/bin/sh"
+		sshdConnectCommand += "&& /bin/sh"
 	}
 
 	homeBase := t.TempDir()
 	userHome := filepath.Join(homeBase, user)
-	sshdPort := startSSHd(t, hostKey, sshdConnectCommand, append([]string{
+	sshdPort := startSSHD(t, hostKey, sshdConnectCommand, append([]string{
 		fmt.Sprintf("HOME=%s", homeBase),
 		fmt.Sprintf("LD_PRELOAD=%s", strings.Join(preloadLibraries, ":")),
 		fmt.Sprintf("AUTHD_TEST_SSH_USER=%s", user),
 		fmt.Sprintf("AUTHD_TEST_SSH_HOME=%s", userHome),
 		fmt.Sprintf("AUTHD_TEST_SSH_PAM_SERVICE=%s", serviceFile),
-	}, env...), daemonize)
+	}, env...))
 
 	return sshdPort, userHome
 }
 
-func sshdCommand(t *testing.T, port, hostKey, forcedCommand string, env []string, daemonize bool) (*exec.Cmd, string, string) {
+func sshdCommand(t *testing.T, port, hostKey, forcedCommand string, env []string) (*exec.Cmd, string) {
 	t.Helper()
 
-	logFile := ""
-	pidFile := ""
-	runModeArgs := []string{"-ddd"}
-
-	if daemonize {
-		pidFile = filepath.Join(t.TempDir(), "sshd.pid")
-		logFile = filepath.Join(t.TempDir(), "sshd-daemon.log")
-		saveArtifactsForDebugOnCleanup(t, []string{logFile})
-
-		runModeArgs = []string{
-			"-E", logFile,
-			"-o", "PidFile=" + pidFile,
-			"-o", "LogLevel=DEBUG3",
-		}
-	}
+	pidFile := filepath.Join(t.TempDir(), "sshd.pid")
 
 	// #nosec:G204 - we control the command arguments in tests
 	sshd := exec.Command("/usr/sbin/sshd",
 		"-f", os.DevNull,
 		"-p", port,
 		"-h", hostKey,
+		"-D",
+		"-e",
+		"-o", "LogLevel=DEBUG3",
+		"-o", "PidFile="+pidFile,
 		"-o", "UsePAM=yes",
 		"-o", "KbdInteractiveAuthentication=yes",
 		"-o", "AuthenticationMethods=keyboard-interactive",
@@ -673,14 +692,13 @@ func sshdCommand(t *testing.T, port, hostKey, forcedCommand string, env []string
 		"-o", "ForceCommand="+forcedCommand,
 		"-o", "MaxAuthTries=1",
 	)
-	sshd.Args = append(sshd.Args, runModeArgs...)
 	sshd.Env = append(sshd.Env, env...)
 	sshd.Env = testutils.AppendCovEnv(sshd.Env)
 
-	return sshd, pidFile, logFile
+	return sshd, pidFile
 }
 
-func startSSHd(t *testing.T, hostKey, forcedCommand string, env []string, daemonize bool) string {
+func startSSHD(t *testing.T, hostKey, forcedCommand string, env []string) string {
 	t.Helper()
 
 	// We use this to easily find a free port we can use, without going random
@@ -690,28 +708,21 @@ func startSSHd(t *testing.T, hostKey, forcedCommand string, env []string, daemon
 	sshdPort := url.Port()
 	server.Close()
 
-	sshd, sshdPidFile, sshdLogFile := sshdCommand(t, sshdPort, hostKey, forcedCommand, env, daemonize)
-	sshdStderr := bytes.Buffer{}
-	sshd.Stderr = &sshdStderr
-	if testing.Verbose() {
-		sshd.Stdout = os.Stdout
-		sshd.Stderr = os.Stderr
-	}
+	sshd, sshdPidFile := sshdCommand(t, sshdPort, hostKey, forcedCommand, env)
 
-	t.Log("Launching sshd with", sshd.Env, sshd.Args)
+	sshdOutput := testutils.NewSyncBuffer()
+
+	// Write stdout/stderr both to our stdout/stderr and to the buffer
+	sshd.Stdout = io.MultiWriter(testlog.NewTestWriter(t), sshdOutput)
+	sshd.Stderr = io.MultiWriter(newFilteredStderrWriter(testlog.NewTestWriter(t)), sshdOutput)
+
+	testlog.LogCommand(t, "Starting sshd", sshd)
+	start := time.Now()
 	err = sshd.Start()
 	require.NoError(t, err, "Setup: Impossible to start sshd")
 	sshdPid := sshd.Process.Pid
 
-	t.Cleanup(func() {
-		if testing.Verbose() || !t.Failed() {
-			return
-		}
-		sshdLog := filepath.Join(t.TempDir(), "sshd.log")
-		require.NoError(t, os.WriteFile(sshdLog, sshdStderr.Bytes(), 0600),
-			"TearDown: Saving sshd log")
-		saveArtifactsForDebug(t, []string{sshdLog})
-	})
+	testutils.MaybeSaveBufferAsArtifactOnCleanup(t, sshdOutput, "sshd.log")
 
 	t.Cleanup(func() {
 		if sshd.Process == nil {
@@ -721,67 +732,40 @@ func startSSHd(t *testing.T, hostKey, forcedCommand string, env []string, daemon
 		sshdExited := make(chan *os.ProcessState)
 		go func() {
 			processState, err := sshd.Process.Wait()
-			require.NoError(t, err, "TearDown: Waiting SSHd failed")
+			require.NoError(t, err, "TearDown: Waiting sshd failed")
 			sshdExited <- processState
 		}()
 
 		t.Log("Waiting for sshd to be terminated")
 		select {
 		case <-time.After(sleepDuration(5 * time.Second)):
-			require.NoError(t, sshd.Process.Kill(), "TearDown: Killing SSHd failed")
-			if !testing.Verbose() {
-				t.Logf("SSHd stopped (killed)\n ##### STDERR #####\n %s \n ##### END #####",
-					sshdStderr.String())
-			}
-			t.Fatal("SSHd didn't finish in time!")
+			require.NoError(t, sshd.Process.Kill(), "TearDown: Killing sshd failed")
+			t.Fatal("sshd didn't exit in time!")
 		case state := <-sshdExited:
-			t.Logf("SSHd %v stopped (%s)!", sshdPid, state)
-			if !testing.Verbose() {
-				t.Logf("##### STDERR #####\n %s \n ##### END #####", sshdStderr.String())
-			}
-			expectedExitCode := 255
-			if daemonize {
-				expectedExitCode = 0
-			}
-			require.Equal(t, expectedExitCode, state.ExitCode(), "TearDown: SSHd exited with %s", state)
+			t.Logf("sshd[%v] exited (%s)", sshdPid, state)
+			expectedExitCode := -1
+			require.Equal(t, expectedExitCode, state.ExitCode(), "TearDown: sshd exited with %s", state)
 		}
 	})
 
-	if !daemonize {
-		// Sadly we can't wait for SSHd to be ready using net.Dial, since that will make sshd
-		// (when in debug mode) not to accept further connections from the actual test, but we
-		// can assume we're good.
-		t.Logf("SSHd started with pid %d and listening on port %s", sshdPid, sshdPort)
-		return sshdPort
-	}
-
-	t.Cleanup(func() {
-		if !t.Failed() && !testing.Verbose() {
-			return
-		}
-		contents, err := os.ReadFile(sshdLogFile)
-		require.NoError(t, err, "TearDown: Reading SSHd log failed")
-		t.Logf(" ##### LOG FILE #####\n %s \n ##### END #####", contents)
-	})
-
 	t.Cleanup(func() {
 		pidFileContent, err := os.ReadFile(sshdPidFile)
-		require.NoError(t, err, "TearDown: Reading SSHd pid file failed")
+		require.NoError(t, err, "TearDown: Reading sshd pid file failed")
 		p := strings.TrimSpace(string(pidFileContent))
 		pid, err := strconv.Atoi(p)
-		require.NoError(t, err, "TearDown: Parsing SSHd pid file content: %q", p)
+		require.NoError(t, err, "TearDown: Parsing sshd pid file content: %q", p)
 		process, err := os.FindProcess(pid)
-		require.NoError(t, err, "TearDown: Finding SSHd process")
+		require.NoError(t, err, "TearDown: Finding sshd process")
 		err = process.Kill()
-		require.NoError(t, err, "TearDown: Killing SSHd process")
-		t.Logf("SSHd pid %d killed", pid)
+		require.NoError(t, err, "TearDown: Killing sshd process")
+		t.Logf("Sent SIGKILL to sshd[%d]", pid)
 	})
 
 	sshdStarted := make(chan error)
 	go func() {
 		for {
 			conn, err := net.DialTimeout("tcp", ":"+sshdPort, sleepDuration(1*time.Second))
-			if errors.Is(err, syscall.ECONNREFUSED) {
+			if errors.Is(err, syscall.ECONNREFUSED) || errors.Is(err, syscall.ECONNRESET) {
 				continue
 			}
 			if err != nil {
@@ -805,22 +789,64 @@ func startSSHd(t *testing.T, hostKey, forcedCommand string, env []string, daemon
 	select {
 	case <-time.After(sleepDuration(5 * time.Second)):
 		_ = sshd.Process.Kill()
-		if !testing.Verbose() {
-			t.Logf("SSHd stopped (killed)\n ##### STDERR #####\n %s \n ##### END #####",
-				sshdStderr.String())
-		}
-		t.Fatal("SSHd didn't start in time!")
+		t.Fatal("sshd didn't start in time!")
 	case err := <-sshdStarted:
-		require.NoError(t, err, "Setup: SSHd startup checking failed %s",
-			sshdStderr.String())
+		require.NoError(t, err, "Setup: sshd startup checking failed")
 	}
-	require.NoError(t, err, "Setup: Waiting SSHd failed")
+	require.NoError(t, err, "Setup: Waiting sshd failed")
 
 	pidFileContent, err := os.ReadFile(sshdPidFile)
-	require.NoError(t, err, "Setup: Reading SSHd pid file failed")
+	require.NoError(t, err, "Setup: Reading sshd pid file failed")
 
-	t.Logf("SSHd started with pid %d (%s) and listening on port %s",
-		sshdPid, strings.TrimSpace(string(pidFileContent)), sshdPort)
+	duration := time.Since(start)
+	testlog.LogEndSeparatorf(t, "sshd started in %.3fs - pid: %d (%s), listen port: %s",
+		duration.Seconds(), sshdPid, strings.TrimSpace(string(pidFileContent)), sshdPort)
 
 	return sshdPort
 }
+
+type filteredStderrWriter struct {
+	w io.Writer
+}
+
+func newFilteredStderrWriter(w io.Writer) *filteredStderrWriter {
+	return &filteredStderrWriter{w: w}
+}
+
+func (fw *filteredStderrWriter) Write(p []byte) (n int, err error) {
+	debugLevel := strings.ToLower(os.Getenv("AUTHD_SSHD_STDERR_DEBUG_LEVEL"))
+	if debugLevel == "" {
+		debugLevel = "1"
+	}
+
+	lines := strings.Split(string(p), "\n")
+	var outLines []string
+	for _, line := range lines {
+		// Only print lines with a debug level less than or equal to the configured level
+		if strings.HasPrefix(line, "debug") {
+			switch debugLevel {
+			case "1":
+				if strings.HasPrefix(line, "debug2") || strings.HasPrefix(line, "debug3") {
+					continue
+				}
+			case "2":
+				if strings.HasPrefix(line, "debug3") {
+					continue
+				}
+			case "3":
+				// Print all debug lines
+			default:
+				// Unknown debug level, don't print any debug lines
+				continue
+			}
+		}
+		outLines = append(outLines, line)
+	}
+	out := strings.Join(outLines, "\n")
+	if out == "" {
+		return len(p), nil
+	}
+
+	_, err = fw.w.Write([]byte(out))
+	return len(p), err
+}
diff --git a/pam/integration-tests/sshd_preloader/sshd_preloader.c b/pam/integration-tests/sshd_preloader/sshd_preloader.c
index 37dcb69e4b..d38f075513 100644
--- a/pam/integration-tests/sshd_preloader/sshd_preloader.c
+++ b/pam/integration-tests/sshd_preloader/sshd_preloader.c
@@ -33,7 +33,7 @@ static MockPasswd passwd_entities[512];
 __attribute__((constructor))
 void constructor (void)
 {
-  fprintf (stderr, "sshd_preloader [%d]: Library loaded\n", getpid ());
+  fprintf (stderr, "sshd_preloader[%d]: Library loaded\n", getpid ());
 }
 
 __attribute__((destructor))
@@ -42,7 +42,7 @@ void destructor (void)
   for (size_t i = 0; i < SIZE_OF_ARRAY (passwd_entities); ++i)
     free (passwd_entities[i].authd_name);
 
-  fprintf (stderr, "sshd_preloader [%d]: Library unloaded\n", getpid ());
+  fprintf (stderr, "sshd_preloader[%d]: Library unloaded\n", getpid ());
 }
 
 static const char *
@@ -210,7 +210,7 @@ getpwnam (const char *name)
           mock_passwd->authd_name = n;
           passwd_entity->pw_name = mock_passwd->authd_name;
 
-          fprintf (stderr, "sshd_preloader [%d]: User %s converted to %s\n",
+          fprintf (stderr, "sshd_preloader[%d]: User %s converted to %s\n",
                   getpid (), name, passwd_entity->pw_name);
         }
     }
@@ -225,7 +225,7 @@ getpwnam (const char *name)
   passwd_entity->pw_uid = getuid ();
   passwd_entity->pw_gid = getgid ();
 
-  fprintf (stderr, "sshd_preloader [%d]: Simulating to be fake user %s (%d:%d)\n",
+  fprintf (stderr, "sshd_preloader[%d]: Simulating to be fake user %s (%d:%d)\n",
            getpid (), passwd_entity->pw_name, passwd_entity->pw_uid,
            passwd_entity->pw_gid);
 
@@ -249,7 +249,7 @@ fopen (const char *pathname, const char *mode)
   if (strcmp (pathname, "/etc/pam.d/" AUTHD_DEFAULT_SSH_PAM_SERVICE_NAME) == 0 ||
       strcmp (pathname, "/usr/lib/pam.d/" AUTHD_DEFAULT_SSH_PAM_SERVICE_NAME) == 0)
     {
-      fprintf (stderr, "sshd_preloader [%d]: Trying to open '%s', "
+      fprintf (stderr, "sshd_preloader[%d]: Trying to open '%s', "
                "but redirecting instead to '%s'\n",
                getpid (), pathname, service_path);
       pathname = service_path;
diff --git a/pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd b/pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd
rename to pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd
diff --git a/pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd b/pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd
rename to pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd
diff --git a/pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd b/pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd
rename to pam/integration-tests/testdata/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset
index 29a81bd914..4be50e1b53 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset
@@ -130,17 +130,17 @@ Enter 'r' to cancel the request and go back to choose the provider
 >
 PAM Authenticate() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset'
 PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset'
-Environment:
-  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset
-  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_accept_password_reset]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_accept_password_reset]
+  TERM=xterm-256color
+  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset_with_shared_sshd
similarity index 76%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset_with_shared_sshd
index 608dd088d5..fbc802178b 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_accept_password_reset_with_shared_sshd
@@ -2,137 +2,137 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose action:
 > 1
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Confirm Password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Confirm Password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd@localhost) Confirm Password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd@localhost) Confirm Password:
 >
-PAM Authenticate() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd'
+PAM Authenticate() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd
+  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -140,7 +140,7 @@ PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authe
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-on-shared-sshd
+  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-accept-password-reset-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group
index d451fb3409..eb41b4027c 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group
@@ -35,17 +35,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group'
 PAM AcctMgmt() finished for user 'user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group'
-Environment:
-  USER=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group
-  LOGNAME=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group]
+  TERM=xterm-256color
+  USER=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd
similarity index 76%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd
index ea22601790..43bf0db48f 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd
@@ -2,50 +2,50 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd@localhost) Choose your provider:
+(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd@localhost) Choose your provider:
+(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd@localhost) Choose your provider:
+(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd@localhost) Gimme your password:
+(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd@localhost) Choose your provider:
+(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd@localhost) Gimme your password:
+(user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd'
-Environment:
-  USER=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd
-  LOGNAME=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd
+PAM Authenticate() finished for user 'user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd'
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd]
+  TERM=xterm-256color
+  USER=user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd.group b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd.group
similarity index 52%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd.group
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd.group
index 5222b1a7d6..7be90f299d 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd.group
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd.group
@@ -1 +1 @@
-localgroup:x:41:user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-on-shared-sshd
+localgroup:x:41:user-local-groups-integration-pre-check-ssh-authenticate-user-and-add-it-to-local-group-with-shared-sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd.group.backup b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd.group.backup
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_on_shared_SSHd.group.backup
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_add_it_to_local_group_with_shared_sshd.group.backup
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset
index ddb963d00b..d19bafcc51 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset
@@ -78,17 +78,17 @@ Or enter 'r' to go back to choose the provider
 > 2
 PAM Authenticate() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset'
 PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset'
-Environment:
-  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset
-  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_offer_password_reset]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_offer_password_reset]
+  TERM=xterm-256color
+  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset_with_shared_sshd
similarity index 79%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset_with_shared_sshd
index 1db1c13d69..92fdbb58b3 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_offer_password_reset_with_shared_sshd
@@ -2,85 +2,85 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose action:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose your provider:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Gimme your password:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd@localhost) Choose action:
+(user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd@localhost) Choose action:
 > 2
-PAM Authenticate() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd'
+PAM Authenticate() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd
+  LOGNAME=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -88,7 +88,7 @@ PAM AcctMgmt() finished for user 'user-can-reset-integration-pre-check-ssh-authe
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-on-shared-sshd
+  USER=user-can-reset-integration-pre-check-ssh-authenticate-user-and-offer-password-reset-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy
index 0f4f4ade36..44c5089809 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy
@@ -76,17 +76,17 @@ Enter 'r' to cancel the request and go back to choose the provider
 >
 PAM Authenticate() finished for user 'user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy'
 PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy'
-Environment:
-  USER=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy
-  LOGNAME=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy]
+  TERM=xterm-256color
+  USER=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy_with_shared_sshd
similarity index 75%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy_with_shared_sshd
index f96cb92ee5..c3b37a9abf 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_while_enforcing_policy_with_shared_sshd
@@ -2,83 +2,83 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Confirm Password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Confirm Password:
 >
-PAM Authenticate() finished for user 'user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd'
+PAM Authenticate() finished for user 'user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd
+  LOGNAME=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -86,7 +86,7 @@ PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-aut
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-on-shared-sshd
+  USER=user-needs-reset-integration-pre-check-ssh-authenticate-user-and-reset-password-while-enforcing-policy-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_with_case_insensitive_user_selection_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_with_case_insensitive_user_selection_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_with_case_insensitive_user_selection_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_and_reset_password_with_case_insensitive_user_selection_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully
index b9a4e17fe3..6374437b82 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully
@@ -35,17 +35,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully]
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration
index e566e9fd0e..66b5dc6a47 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration
@@ -11,17 +11,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-cached'
 PAM AcctMgmt() finished for user 'user-integration-cached'
-Environment:
-  USER=user-integration-cached
-  LOGNAME=user-integration-cached
+Could not chdir to home directory /home/user-integration-cached: No such file or directory
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-cached
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration]
+  TERM=xterm-256color
+  USER=user-integration-cached
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd
similarity index 88%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd
index 29303a5bc3..3c5da276e4 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd
@@ -11,17 +11,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-cached'
 PAM AcctMgmt() finished for user 'user-integration-cached'
-Environment:
-  USER=user-integration-cached
-  LOGNAME=user-integration-cached
+Could not chdir to home directory /home/user-integration-cached: No such file or directory
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-cached
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd]
+  TERM=xterm-256color
+  USER=user-integration-cached
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd.group b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd.group
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd.group
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd.group
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd.group.backup b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd.group.backup
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_on_shared_SSHd.group.backup
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_after_db_migration_with_shared_sshd.group.backup
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell
index 84cac98481..7d4e45cf72 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell
@@ -28,16 +28,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+$
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
@@ -51,16 +53,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+$ echo $USER
 user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
 $
 ────────────────────────────────────────────────────────────────────────────────
@@ -76,16 +80,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+$ echo $USER
 user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
 $ [ -n "${SSH_CONNECTION}" ] && echo "Inside SSH"
 Inside SSH
@@ -103,16 +109,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+$ echo $USER
 user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
 $ [ -n "${SSH_CONNECTION}" ] && echo "Inside SSH"
 Inside SSH
@@ -132,16 +140,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
+$ echo $USER
 user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell
 $ [ -n "${SSH_CONNECTION}" ] && echo "Inside SSH"
 Inside SSH
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd
similarity index 70%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd
index 652c087d5e..d6bdec597a 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd
@@ -2,91 +2,97 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
+$
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
-user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
+$ echo $USER
+user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
 $
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
-user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
+$ echo $USER
+user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
 $ [ -n "${SSH_CONNECTION}" ] && echo "Inside SSH"
 Inside SSH
 $
@@ -95,25 +101,27 @@ $
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
-user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
+$ echo $USER
+user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
 $ [ -n "${SSH_CONNECTION}" ] && echo "Inside SSH"
 Inside SSH
 $
@@ -124,25 +132,27 @@ Connection to localhost closed.
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd'
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_and_enters_shell_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
-user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-on-shared-sshd
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
+$ echo $USER
+user-integration-pre-check-ssh-authenticate-user-successfully-and-enters-shell-with-shared-sshd
 $ [ -n "${SSH_CONNECTION}" ] && echo "Inside SSH"
 Inside SSH
 $
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered
index 483744b389..752a00caa7 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered
@@ -35,17 +35,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-ssh'
 PAM AcctMgmt() finished for user 'user-ssh'
-Environment:
-  USER=user-ssh
-  LOGNAME=user-ssh
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-ssh
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered]
+  TERM=xterm-256color
+  USER=user-ssh
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case
index c6b36539ae..b46e2237bf 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case
@@ -35,17 +35,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-ssh2'
 PAM AcctMgmt() finished for user 'user-ssh2'
-Environment:
-  USER=user-ssh2
-  LOGNAME=user-ssh2
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-ssh2
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case]
+  TERM=xterm-256color
+  USER=user-ssh2
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_if_already_registered_with_upper_case_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_shared_sshd
similarity index 73%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_shared_sshd
index 8c5225093d..9bbfb6493d 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_shared_sshd
@@ -2,42 +2,42 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd'
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -45,7 +45,7 @@ PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-us
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-integration-pre-check-ssh-authenticate-user-successfully-on-shared-sshd
+  USER=user-integration-pre-check-ssh-authenticate-user-successfully-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case
index 6a14d8c794..885c12d6bd 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case
@@ -35,17 +35,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-upper-case-testsshauthenticate'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-upper-case-testsshauthenticate'
-Environment:
-  USER=user-integration-pre-check-upper-case-testsshauthenticate
-  LOGNAME=user-integration-pre-check-upper-case-testsshauthenticate
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-upper-case-testsshauthenticate
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case]
+  TERM=xterm-256color
+  USER=user-integration-pre-check-upper-case-testsshauthenticate
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_successfully_with_upper_case_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode
index cd4013a9a8..1a65a7c026 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode
@@ -3528,17 +3528,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 > 4242
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-auth-mode'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-auth-mode'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_switching_auth_mode]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_switching_auth_mode]
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode_with_shared_sshd
similarity index 74%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode_with_shared_sshd
index 788bb9a904..a8791bff44 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_auth_mode_with_shared_sshd
@@ -2,1495 +2,1495 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -1500,111 +1500,111 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -1614,111 +1614,111 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -1728,123 +1728,123 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -1854,123 +1854,123 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -1980,129 +1980,129 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -2112,129 +2112,129 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -2244,141 +2244,141 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -2388,141 +2388,141 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -2532,144 +2532,144 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -2679,144 +2679,144 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > -1
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -2826,157 +2826,157 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > -1
 Invalid selection
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -2986,157 +2986,157 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > -1
 Invalid selection
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -3146,161 +3146,161 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > -1
 Invalid selection
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -3310,161 +3310,161 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > -1
 Invalid selection
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > 4242
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 3
-== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com ==
+== Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com ==
 Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switching
--auth-mode-on-shared-sshd@gmail.com or enter the code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Click on the link received at user-integration-pre-check-ssh-authenticate-user-switchi
+ng-auth-mode-with-shared-sshd@gmail.com or enter the code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 4
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 5
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 6
 == Use your phone +1... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Unlock your phone +1... or accept request on web interface:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -3474,63 +3474,63 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose action:
 > r
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > invalid-selection
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > -1
 Invalid selection
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 7
 == Pin code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd@localhost) Enter your pin code:
+(user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd@localhost) Enter your pin code:
 > 4242
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd'
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -3538,7 +3538,7 @@ PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-us
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-on-shared-sshd
+  USER=user-integration-pre-check-ssh-authenticate-user-switching-auth-mode-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_to_local_broker_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_to_local_broker_with_shared_sshd
similarity index 77%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_to_local_broker_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_to_local_broker_with_shared_sshd
index 860f284d5a..b11c15b334 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_to_local_broker_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_switching_to_local_broker_with_shared_sshd
@@ -2,302 +2,302 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > invalid-ID
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > invalid-ID
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > invalid-ID
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 555
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > invalid-ID
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 555
 Invalid selection
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > invalid-ID
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 555
 Invalid selection
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 1
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > invalid-ID
 Unsupported input
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 555
 Invalid selection
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Choose your provider:
 > 1
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd'
-SSH PAM user 'user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd' using local broker
-(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-on-shared-sshd@localhost) Password:
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd'
+SSH PAM user 'user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd' using local broker
+(user-integration-pre-check-ssh-authenticate-user-switching-to-local-broker-with-shared-sshd@localhost) Password:
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button
index 3133464fe6..ca36f8b8a6 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button
@@ -315,17 +315,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 > temporary pass00
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button]
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button_with_shared_sshd
similarity index 79%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button_with_shared_sshd
index d124c366a1..eedddd0258 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_form_mode_with_button_with_shared_sshd
@@ -2,322 +2,322 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 2
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (2 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 2
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (2 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 1
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 2
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (2 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Enter your one time credential:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 2
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (2 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Enter your one time credential:
 > temporary pass00
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 2
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (2 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd@localhost) Enter your one time credential:
 > temporary pass00
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd'
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -325,7 +325,7 @@ PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-us
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-on-shared-sshd
+  USER=user-integration-pre-check-ssh-authenticate-user-with-form-mode-with-button-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa
index 616e92c3e1..155a70fbcf 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa
@@ -474,17 +474,17 @@ Press Enter to wait for authentication or enter 'r' to go back to select the aut
 >
 PAM Authenticate() finished for user 'user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa'
 PAM AcctMgmt() finished for user 'user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa'
-Environment:
-  USER=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa
-  LOGNAME=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mfa]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mfa]
+  TERM=xterm-256color
+  USER=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy
index de01652f12..b0a4a3051b 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy
@@ -260,17 +260,17 @@ Enter 'r' to cancel the request and go back to choose the provider
 >
 PAM Authenticate() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy'
 PAM AcctMgmt() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy'
-Environment:
-  USER=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy
-  LOGNAME=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy]
+  TERM=xterm-256color
+  USER=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy_with_shared_sshd
similarity index 68%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy_with_shared_sshd
index 7123e33bbc..c2b549aae9 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_password_while_enforcing_policy_with_shared_sshd
@@ -2,267 +2,267 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose action:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose action:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose action:
 > 1
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose action:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose action:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 The password fails the dictionary check - it is based on a dictionary word
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose action:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 The password fails the dictionary check - it is based on a dictionary word
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose action:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 The password fails the dictionary check - it is based on a dictionary word
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Confirm Password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Confirm Password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 2 step(s) missing
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
   1. Proceed with password update
   2. Skip
 Or enter 'r' to go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Choose action:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Choose action:
 > 1
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 The password fails the dictionary check - it is based on a dictionary word
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
 >
-(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd@localhost) Confirm Password:
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd@localhost) Confirm Password:
 >
-PAM Authenticate() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd'
+PAM Authenticate() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd
+  LOGNAME=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -270,7 +270,7 @@ PAM AcctMgmt() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-on-shared-sshd
+  USER=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-password-while-enforcing-policy-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password
index 24ac0823dc..8f52cfaee4 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password
@@ -171,17 +171,17 @@ Enter 'r' to cancel the request and go back to choose the provider
 >
 PAM Authenticate() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password'
 PAM AcctMgmt() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password'
-Environment:
-  USER=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password
-  LOGNAME=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password]
+  TERM=xterm-256color
+  USER=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password_with_shared_sshd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password_with_shared_sshd
new file mode 100644
index 0000000000..59b1c262ea
--- /dev/null
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_and_reset_same_password_with_shared_sshd
@@ -0,0 +1,187 @@
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+>
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+== Password authentication ==
+Enter 'r' to cancel the request and go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Gimme your password:
+>
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+== Password authentication ==
+Enter 'r' to cancel the request and go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Gimme your password:
+>
+Password reset, 2 step(s) missing
+== Use your fido device foo ==
+Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
+>
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+== Password authentication ==
+Enter 'r' to cancel the request and go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Gimme your password:
+>
+Password reset, 2 step(s) missing
+== Use your fido device foo ==
+Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
+>
+Password reset, 1 step(s) missing
+== Password reset ==
+  1. Proceed with password update
+  2. Skip
+Or enter 'r' to go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose action:
+>
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+== Password authentication ==
+Enter 'r' to cancel the request and go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Gimme your password:
+>
+Password reset, 2 step(s) missing
+== Use your fido device foo ==
+Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
+>
+Password reset, 1 step(s) missing
+== Password reset ==
+  1. Proceed with password update
+  2. Skip
+Or enter 'r' to go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose action:
+> 1
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+== Password authentication ==
+Enter 'r' to cancel the request and go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Gimme your password:
+>
+Password reset, 2 step(s) missing
+== Use your fido device foo ==
+Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
+>
+Password reset, 1 step(s) missing
+== Password reset ==
+  1. Proceed with password update
+  2. Skip
+Or enter 'r' to go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose action:
+> 1
+== Password reset ==
+Enter 'r' to cancel the request and go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+>
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+== Password authentication ==
+Enter 'r' to cancel the request and go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Gimme your password:
+>
+Password reset, 2 step(s) missing
+== Use your fido device foo ==
+Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
+>
+Password reset, 1 step(s) missing
+== Password reset ==
+  1. Proceed with password update
+  2. Skip
+Or enter 'r' to go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose action:
+> 1
+== Password reset ==
+Enter 'r' to cancel the request and go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+>
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Confirm Password:
+>
+────────────────────────────────────────────────────────────────────────────────
+> ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
+== Provider selection ==
+  1. local
+  2. ExampleBroker
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose your provider:
+> 2
+== Password authentication ==
+Enter 'r' to cancel the request and go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Gimme your password:
+>
+Password reset, 2 step(s) missing
+== Use your fido device foo ==
+Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
+>
+Password reset, 1 step(s) missing
+== Password reset ==
+  1. Proceed with password update
+  2. Skip
+Or enter 'r' to go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Choose action:
+> 1
+== Password reset ==
+Enter 'r' to cancel the request and go back to choose the provider
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Enter your new password (3 days until mandatory):
+>
+(user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd@localhost) Confirm Password:
+>
+PAM Authenticate() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd'
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
+  HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd
+  PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
+  SHELL=/bin/sh
+  SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
+  SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
+  SSH_TTY=${AUTHD_TEST_SSH_TTY}
+  TERM=xterm-256color
+  USER=user-mfa-with-reset-integration-pre-check-ssh-authenticate-user-with-mfa-and-reset-same-password-with-shared-sshd
+Connection to localhost closed.
+>
+────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_with_shared_sshd
similarity index 61%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_with_shared_sshd
index 346cae988c..1e3f726bbc 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mfa_with_shared_sshd
@@ -2,481 +2,481 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your provider:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@gmail.com
+  3. Send URL to user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Gimme your password:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Gimme your password:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 1
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 > r
 == Authentication method selection ==
   1. Use your fido device foo
   2. Use your phone +33...
   3. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Choose your authentication method:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use your phone +33... ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Unlock your phone +33... or accept request on web interface:
 >
 == Use your fido device foo ==
 Press Enter to wait for authentication or enter 'r' to go back to select the authentication method
-(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd@localhost) Plug your fido device and press with your thumb:
+(user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd@localhost) Plug your fido device and press with your thumb:
 >
-PAM Authenticate() finished for user 'user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd'
+PAM Authenticate() finished for user 'user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd
+  LOGNAME=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -484,7 +484,7 @@ PAM AcctMgmt() finished for user 'user-mfa-integration-pre-check-ssh-authenticat
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-on-shared-sshd
+  USER=user-mfa-integration-pre-check-ssh-authenticate-user-with-mfa-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration
index f6940d503d..205ad6d98e 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration
@@ -11,17 +11,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-with-mixed-case'
 PAM AcctMgmt() finished for user 'user-integration-with-mixed-case'
-Environment:
-  USER=user-integration-with-mixed-case
-  LOGNAME=user-integration-with-mixed-case
+Could not chdir to home directory /home/user-integration-WITH-Mixed-CaSe: No such file or directory
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-with-mixed-case
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration]
+  TERM=xterm-256color
+  USER=user-integration-with-mixed-case
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd
similarity index 88%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd
index 5f7626510a..e35e643b2c 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd
@@ -11,17 +11,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-with-mixed-case'
 PAM AcctMgmt() finished for user 'user-integration-with-mixed-case'
-Environment:
-  USER=user-integration-with-mixed-case
-  LOGNAME=user-integration-with-mixed-case
+Could not chdir to home directory /home/user-integration-WITH-Mixed-CaSe: No such file or directory
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-with-mixed-case
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd]
+  TERM=xterm-256color
+  USER=user-integration-with-mixed-case
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd.group b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd.group
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd.group
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd.group
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd.group.backup b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd.group.backup
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_on_shared_SSHd.group.backup
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_mixed_case_after_db_migration_with_shared_sshd.group.backup
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code
index 076b4809ae..03521717e4 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code
@@ -673,17 +673,17 @@ Or enter 'r' to go back to select the authentication method
 > 1
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-qr-code'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-qr-code'
-Environment:
-  USER=user-integration-pre-check-ssh-authenticate-user-with-qr-code
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-qr-code
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_qr_code]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-qr-code
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_qr_code]
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-authenticate-user-with-qr-code
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code_with_shared_sshd
similarity index 67%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code_with_shared_sshd
index e4d3f4a43e..023e478aec 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_qr_code_with_shared_sshd
@@ -2,94 +2,94 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -99,30 +99,30 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -132,30 +132,30 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -165,7 +165,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -175,30 +175,30 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -208,7 +208,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -218,30 +218,30 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -251,7 +251,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -261,7 +261,7 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -271,30 +271,30 @@ https://ubuntuforum-br.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -304,7 +304,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -314,7 +314,7 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -324,30 +324,30 @@ https://ubuntuforum-br.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -357,7 +357,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -367,7 +367,7 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -377,7 +377,7 @@ https://ubuntuforum-br.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -387,30 +387,30 @@ https://www.ubuntu-it.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -420,7 +420,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -430,7 +430,7 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -440,7 +440,7 @@ https://ubuntuforum-br.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -450,30 +450,30 @@ https://www.ubuntu-it.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -483,7 +483,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -493,7 +493,7 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -503,7 +503,7 @@ https://ubuntuforum-br.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -513,7 +513,7 @@ https://www.ubuntu-it.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -523,30 +523,30 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -556,7 +556,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -566,7 +566,7 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -576,7 +576,7 @@ https://ubuntuforum-br.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -586,7 +586,7 @@ https://www.ubuntu-it.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -596,30 +596,30 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 1
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose your authentication method:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -629,7 +629,7 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -639,7 +639,7 @@ https://ubuntu.fr/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -649,7 +649,7 @@ https://ubuntuforum-br.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -659,7 +659,7 @@ https://www.ubuntu-it.org/
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 2
 == Use a Login code ==
 Enter the code in the login page
@@ -669,13 +669,13 @@ https://ubuntu.com
   1. Wait for authentication result
   2. Regenerate code
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd@localhost) Choose action:
 > 1
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd'
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd
+  LOGNAME=user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -683,7 +683,7 @@ PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-authenticate-us
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-integration-pre-check-ssh-authenticate-user-with-qr-code-on-shared-sshd
+  USER=user-integration-pre-check-ssh-authenticate-user-with-qr-code-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration
index 8373a5b8e4..d625a65467 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration
@@ -11,17 +11,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-upper-case'
 PAM AcctMgmt() finished for user 'user-integration-upper-case'
-Environment:
-  USER=user-integration-upper-case
-  LOGNAME=user-integration-upper-case
+Could not chdir to home directory /home/user-integration-UPPER-CASE: No such file or directory
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-upper-case
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration]
+  TERM=xterm-256color
+  USER=user-integration-upper-case
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd
similarity index 91%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd
index c30360165b..8b9e6a42c3 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd
@@ -11,17 +11,18 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-upper-case'
 PAM AcctMgmt() finished for user 'user-integration-upper-case'
-Environment:
-  USER=user-integration-upper-case
-  LOGNAME=user-integration-upper-case
+Could not chdir to home directory /home/user-integration-UPPER-CASE: No such file or directory
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-upper-case
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd]
+  TERM=xterm-256color
+  USER=user-integration-upper-case
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd.group b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd.group
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd.group
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd.group
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd.group.backup b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd.group.backup
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_on_shared_SSHd.group.backup
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Authenticate_user_with_upper_case_using_lower_case_after_db_migration_with_shared_sshd.group.backup
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Autoselect_local_broker_for_local_user_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Autoselect_local_broker_for_local_user_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Autoselect_local_broker_for_local_user_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Autoselect_local_broker_for_local_user_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_max_attempts_reached_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_max_attempts_reached_with_shared_sshd
similarity index 81%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_max_attempts_reached_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_max_attempts_reached_with_shared_sshd
index 8254e6e9e5..0836e0279c 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_max_attempts_reached_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_max_attempts_reached_with_shared_sshd
@@ -2,150 +2,150 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-deny-authentication-if-max-attempts-reached-with-shared-sshd@localhost) Gimme your password:
 >
 invalid password 'wrongpass', should be 'goodpass'
 Received disconnect from ${SSH_HOST} port ${SSH_PORT} Too many authentication failures
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria
index 34d48d8cc5..0a3f3ba42a 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria
@@ -322,17 +322,17 @@ Enter 'r' to cancel the request and go back to choose the provider
 >
 PAM Authenticate() finished for user 'user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria'
 PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria'
-Environment:
-  USER=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria
-  LOGNAME=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria]
+  TERM=xterm-256color
+  USER=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria_with_shared_sshd
similarity index 69%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria_with_shared_sshd
index c1f1f2c6f5..8de0339f0a 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_newpassword_does_not_match_required_criteria_with_shared_sshd
@@ -2,329 +2,329 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password fails the dictionary check - it is too simplistic/systematic
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password fails the dictionary check - it is too simplistic/systematic
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Confirm Password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password fails the dictionary check - it is too simplistic/systematic
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Confirm Password:
 >
 Password entries don't match
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password fails the dictionary check - it is too simplistic/systematic
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Confirm Password:
 >
 Password entries don't match
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password fails the dictionary check - it is too simplistic/systematic
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Confirm Password:
 >
 Password entries don't match
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Confirm Password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Choose your provider:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Gimme your password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Gimme your password:
 >
 Password reset, 1 step(s) missing
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password is shorter than 8 characters
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 The password fails the dictionary check - it is too simplistic/systematic
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Confirm Password:
 >
 Password entries don't match
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
 No password supplied
 == Password reset ==
 Enter 'r' to cancel the request and go back to choose the provider
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Enter your new password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Enter your new password:
 >
-(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd@localhost) Confirm Password:
+(user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd@localhost) Confirm Password:
 >
-PAM Authenticate() finished for user 'user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd'
+PAM Authenticate() finished for user 'user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd
+  LOGNAME=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -332,7 +332,7 @@ PAM AcctMgmt() finished for user 'user-needs-reset-integration-pre-check-ssh-den
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-on-shared-sshd
+  USER=user-needs-reset-integration-pre-check-ssh-deny-authentication-if-newpassword-does-not-match-required-criteria-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_and_matches_cancel_key_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_and_matches_cancel_key_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_and_matches_cancel_key_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_and_matches_cancel_key_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Deny_authentication_if_user_does_not_exist_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Error_if_cannot_connect_to_authd_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Error_if_cannot_connect_to_authd_with_shared_sshd
similarity index 86%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Error_if_cannot_connect_to_authd_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Error_if_cannot_connect_to_authd_with_shared_sshd
index 8d0456d0ec..bb0545d4af 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Error_if_cannot_connect_to_authd_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Error_if_cannot_connect_to_authd_with_shared_sshd
@@ -2,7 +2,7 @@
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 could not connect to unix:///some-path/not-existent-socket: service took too long to respond. Disconnecting client
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-error-if-cannot-connect-to-authd-on-shared-sshd'
-SSH PAM user 'user-integration-pre-check-ssh-error-if-cannot-connect-to-authd-on-shared-sshd' using local broker
-(user-integration-pre-check-ssh-error-if-cannot-connect-to-authd-on-shared-sshd@localhost) Password:
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-error-if-cannot-connect-to-authd-with-shared-sshd'
+SSH PAM user 'user-integration-pre-check-ssh-error-if-cannot-connect-to-authd-with-shared-sshd' using local broker
+(user-integration-pre-check-ssh-error-if-cannot-connect-to-authd-with-shared-sshd@localhost) Password:
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_local_broker_is_selected_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_local_broker_is_selected_with_shared_sshd
similarity index 81%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_local_broker_is_selected_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_local_broker_is_selected_with_shared_sshd
index 840f377594..021fc3130b 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_local_broker_is_selected_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_local_broker_is_selected_with_shared_sshd
@@ -2,23 +2,23 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-with-shared-sshd@localhost) Choose your provider:
 > 1
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-with-shared-sshd@localhost) Choose your provider:
 > 1
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-on-shared-sshd'
-SSH PAM user 'user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-on-shared-sshd' using local broker
-(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-on-shared-sshd@localhost) Password:
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-with-shared-sshd'
+SSH PAM user 'user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-with-shared-sshd' using local broker
+(user-integration-pre-check-ssh-exit-authd-if-local-broker-is-selected-with-shared-sshd@localhost) Password:
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_user_sigints_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_user_sigints_with_shared_sshd
similarity index 71%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_user_sigints_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_user_sigints_with_shared_sshd
index 9483f5840c..ce210ddf21 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_user_sigints_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_authd_if_user_sigints_with_shared_sshd
@@ -2,36 +2,36 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Gimme your password:
 >
 
 >
@@ -40,11 +40,11 @@ Enter 'r' to cancel the request and go back to select the authentication method
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-exit-authd-if-user-sigints-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-exit-authd-if-user-sigints-with-shared-sshd@localhost) Gimme your password:
 >
 
 > echo $TERM
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_if_user_is_not_pre-checked_on_ssh_service_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_if_user_is_not_pre-checked_on_ssh_service_with_shared_sshd
similarity index 100%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_if_user_is_not_pre-checked_on_ssh_service_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Exit_if_user_is_not_pre-checked_on_ssh_service_with_shared_sshd
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username
index 99582f31b8..f7ab9587d9 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username
@@ -385,17 +385,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
 >
 PAM Authenticate() finished for user 'user-integration-pre-check-ssh-prevent-user-from-switching-username'
 PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-prevent-user-from-switching-username'
-Environment:
-  USER=user-integration-pre-check-ssh-prevent-user-from-switching-username
-  LOGNAME=user-integration-pre-check-ssh-prevent-user-from-switching-username
+ SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Prevent_user_from_switching_username]
   HOME=${AUTHD_TEST_HOME}
+  LOGNAME=user-integration-pre-check-ssh-prevent-user-from-switching-username
   PATH=${AUTHD_TEST_PATH}
+  PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
-  TERM=xterm-256color
   SSH_CLIENT=${AUTHD_TEST_SSH_CLIENT}
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
- SSHD: Connected to ssh via authd module! [TestSSHAuthenticate/Prevent_user_from_switching_username]
+  TERM=xterm-256color
+  USER=user-integration-pre-check-ssh-prevent-user-from-switching-username
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username_with_shared_sshd
similarity index 77%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username_with_shared_sshd
index dda1c4114e..505eab0768 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Prevent_user_from_switching_username_with_shared_sshd
@@ -2,392 +2,392 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your authentication method:
 > r
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > r
 Unsupported input
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd@localhost) Gimme your password:
 >
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd'
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd
+  LOGNAME=user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -395,7 +395,7 @@ PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-prevent-user-fr
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-integration-pre-check-ssh-prevent-user-from-switching-username-on-shared-sshd
+  USER=user-integration-pre-check-ssh-prevent-user-from-switching-username-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Remember_last_successful_broker_and_mode_on_shared_SSHd b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Remember_last_successful_broker_and_mode_with_shared_sshd
similarity index 81%
rename from pam/integration-tests/testdata/golden/TestSSHAuthenticate/Remember_last_successful_broker_and_mode_on_shared_SSHd
rename to pam/integration-tests/testdata/golden/TestSSHAuthenticate/Remember_last_successful_broker_and_mode_with_shared_sshd
index 556a950ad2..6f4268b628 100644
--- a/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Remember_last_successful_broker_and_mode_on_shared_SSHd
+++ b/pam/integration-tests/testdata/golden/TestSSHAuthenticate/Remember_last_successful_broker_and_mode_with_shared_sshd
@@ -2,205 +2,205 @@
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Gimme your password:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your authentication method:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Enter your one time credential:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Enter your one time credential:
 > temporary pass0
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
 == Provider selection ==
   1. local
   2. ExampleBroker
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your provider:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your provider:
 > 2
 == Password authentication ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Gimme your password:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Gimme your password:
 >
 == Authentication method selection ==
   1. Password authentication
   2. Use a Login code
-  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@gmail.com
+  3. Send URL to user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@gmail.com
   4. Use your fido device foo
   5. Use your phone +33...
   6. Use your phone +1...
   7. Pin code
   8. Authentication code
 Or enter 'r' to go back to choose the provider
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose your authentication method:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose your authentication method:
 > 8
 == Authentication code ==
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Enter your one time credential:
 > temporary pass0
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd'
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd
+  LOGNAME=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -208,7 +208,7 @@ PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-remember-last-s
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd
+  USER=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
@@ -221,7 +221,7 @@ Connection to localhost closed.
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
@@ -229,11 +229,11 @@ Or enter 'r' to go back to select the authentication method
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Enter your one time credential:
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
@@ -241,11 +241,11 @@ Enter 'r' to cancel the request and go back to select the authentication method
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Enter your one time credential:
 > temporary pass0
 ────────────────────────────────────────────────────────────────────────────────
 > ssh ${AUTHD_PAM_SSH_USER}@localhost ${AUTHD_PAM_SSH_ARGS}
@@ -253,17 +253,17 @@ Enter 'r' to cancel the request and go back to select the authentication method
   1. Proceed with Authentication code
   2. Resend SMS (1 sent)
 Or enter 'r' to go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Choose action:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Choose action:
 > 1
 == Authentication code ==
 Enter 'r' to cancel the request and go back to select the authentication method
-(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd@localhost) Enter your one time credential:
+(user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd@localhost) Enter your one time credential:
 > temporary pass0
-PAM Authenticate() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd'
-PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd'
+PAM Authenticate() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd'
+PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd'
  SSHD: Connected to ssh via authd module! [TestSSHAuthenticate]
   HOME=${AUTHD_TEST_HOME}
-  LOGNAME=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd
+  LOGNAME=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd
   PATH=${AUTHD_TEST_PATH}
   PWD=${AUTHD_TEST_PWD}
   SHELL=/bin/sh
@@ -271,7 +271,7 @@ PAM AcctMgmt() finished for user 'user-integration-pre-check-ssh-remember-last-s
   SSH_CONNECTION=${AUTHD_TEST_SSH_CONNECTION}
   SSH_TTY=${AUTHD_TEST_SSH_TTY}
   TERM=xterm-256color
-  USER=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-on-shared-sshd
+  USER=user-integration-pre-check-ssh-remember-last-successful-broker-and-mode-with-shared-sshd
 Connection to localhost closed.
 >
 ────────────────────────────────────────────────────────────────────────────────
diff --git a/pam/integration-tests/vhs-helpers_test.go b/pam/integration-tests/vhs-helpers_test.go
index 0ed5ffa7d5..c2478963d5 100644
--- a/pam/integration-tests/vhs-helpers_test.go
+++ b/pam/integration-tests/vhs-helpers_test.go
@@ -1,7 +1,9 @@
 package main_test
 
 import (
+	"bytes"
 	"fmt"
+	"io"
 	"maps"
 	"math"
 	"os"
@@ -12,6 +14,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 	"unicode/utf8"
@@ -21,6 +24,7 @@ import (
 	"github.com/ubuntu/authd/examplebroker"
 	"github.com/ubuntu/authd/internal/proto/authd"
 	"github.com/ubuntu/authd/internal/services/permissions"
+	"github.com/ubuntu/authd/internal/testlog"
 	"github.com/ubuntu/authd/internal/testutils"
 	"github.com/ubuntu/authd/pam/internal/pam_test"
 )
@@ -69,12 +73,16 @@ type tapeSetting struct {
 }
 
 type tapeData struct {
-	Name      string
-	Command   string
-	Outputs   []string
-	Settings  map[string]any
-	Env       map[string]string
-	Variables map[string]string
+	Name           string
+	Command        string
+	OutputDir      string
+	OutputFilename string
+	Settings       map[string]any
+	Env            map[string]string
+	Variables      map[string]string
+
+	sanitizeOutputOnce sync.Once
+	sanitizedOutput    string
 }
 
 type vhsTestType int
@@ -125,7 +133,7 @@ var (
 )
 
 var (
-	// vhsWaitRegex catches Wait(@timeout)? /Pattern/ commands to re-implement default vhs
+	// vhsWaitRegex catches Wait(@timeout)? /Pattern/ commands to re-implement default VHS
 	// Wait /Pattern/ command with full context on errors.
 	vhsWaitRegex = regexp.MustCompile(`\bWait(\+Line)?(@\S+)?[\t ]+(/(.+)/|(.+))`)
 	// vhsWaitLineRegex catches Wait(@timeout) commands to re-implement default Wait command
@@ -165,7 +173,17 @@ var (
 	vhsClearTape = regexp.MustCompile(`\bClearTerminal\b`)
 )
 
-func newTapeData(tapeName string, settings ...tapeSetting) tapeData {
+func init() {
+	if v := os.Getenv("VHS_WAIT_TIMEOUT"); v != "" {
+		d, err := time.ParseDuration(v)
+		if err != nil {
+			panic(err)
+		}
+		defaultSleepValues[authdWaitDefault] = d
+	}
+}
+
+func newTapeData(tapeName string, outputDir string, settings ...tapeSetting) *tapeData {
 	m := map[string]any{
 		vhsWidth:  800,
 		vhsHeight: 500,
@@ -182,13 +200,12 @@ func newTapeData(tapeName string, settings ...tapeSetting) tapeData {
 	for _, s := range settings {
 		m[s.Key] = s.Value
 	}
-	return tapeData{
-		Name: tapeName,
-		Outputs: []string{
-			tapeName + ".txt",
-		},
-		Settings: m,
-		Env:      make(map[string]string),
+	return &tapeData{
+		Name:           tapeName,
+		OutputDir:      outputDir,
+		OutputFilename: tapeName + ".tape.txt",
+		Settings:       m,
+		Env:            make(map[string]string),
 	}
 }
 
@@ -238,20 +255,30 @@ func (td *tapeData) AddClientOptions(t *testing.T, opts clientOptions) {
 	}
 }
 
-func (td tapeData) RunVhs(t *testing.T, testType vhsTestType, outDir string, cliEnv []string) {
+func (td *tapeData) RunVHS(t *testing.T, testType vhsTestType, cliEnv []string) {
 	t.Helper()
 
 	cmd := exec.Command("env", "vhs")
+
+	var outBuf bytes.Buffer
+	// Write stdout/stderr both to our stdout/stderr and to the buffer
+	cmd.Stdout = io.MultiWriter(testlog.NewTestWriter(t), &outBuf)
+	cmd.Stderr = io.MultiWriter(testlog.NewTestWriter(t), &outBuf)
+
 	cmd.Env = append(testutils.AppendCovEnv(cmd.Env), cliEnv...)
-	cmd.Dir = outDir
+	cmd.Dir = td.OutputDir
 
 	cmd.Env = append(cmd.Env,
 		// If vhs is installed with "go install", we need to add GOPATH to PATH.
-		prependBinToPath(t),
+		pathEnvWithGoBin(t),
 		// vhs uses rod, which downloads chromium to $HOME/.cache/rod,
 		// so $HOME needs to be set to avoid that it downloads it every time.
 		// TODO: Set XDG_CACHE_HOME instead once https://github.com/go-rod/rod/pull/1213 was merged
 		"HOME="+os.Getenv("HOME"),
+		// Force color output, even if stdout is not a tty.
+		"CLICOLOR_FORCE=1",
+		// Avoid VHS printing "Host your GIF on vhs.charm.sh: vhs publish <file>.gif"
+		"VHS_PUBLISH=false",
 	)
 
 	u, err := user.Current()
@@ -284,37 +311,40 @@ func (td tapeData) RunVhs(t *testing.T, testType vhsTestType, outDir string, cli
 		}
 	}
 
-	cmd.Args = append(cmd.Args, td.PrepareTape(t, testType, outDir))
-	out, err := cmd.CombinedOutput()
+	tapePath := td.PrepareTape(t, testType)
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, tapePath, filepath.Join(td.OutputDir, td.OutputFilename))
+	cmd.Args = append(cmd.Args, tapePath)
+
+	err = testlog.RunWithTiming(t, fmt.Sprintf("VHS tape %q", td.Name), cmd, testlog.DoNotSetStdoutAndStderr())
 	if raceLog != "" {
 		checkDataRaces(t, raceLog)
 	}
 
-	isSSHError := func(processOut []byte) bool {
+	sanitizedOutputFilename := strings.TrimSuffix(td.OutputFilename, ".txt") + ".sanitized.txt"
+	testutils.MaybeSaveBytesAsArtifactOnCleanup(t, []byte(td.SanitizedOutput(t)), sanitizedOutputFilename)
+
+	isSSHError := func() bool {
+		out := outBuf.String()
 		const sshConnectionResetByPeer = "Connection reset by peer"
 		const sshConnectionClosed = "Connection closed by"
-		output := string(processOut)
-		return strings.Contains(output, sshConnectionResetByPeer) ||
-			strings.Contains(output, sshConnectionClosed)
+		return strings.Contains(out, sshConnectionResetByPeer) ||
+			strings.Contains(out, sshConnectionClosed)
 	}
-	if err != nil && testType == vhsTestTypeSSH && isSSHError(out) {
-		t.Logf("SSH Connection failed on tape %q: %v: %s", td.Name, err, out)
+	if err != nil && testType == vhsTestTypeSSH && isSSHError() {
+		t.Logf("SSH Connection failed on tape %q: %v", td.Name, err)
 		// We've sometimes (but rarely) seen SSH connection errors which were resolved on retry, so we retry once.
 		// If it fails again, something might actually be broken.
 		//nolint:gosec // G204 it's a test and we explicitly set the parameters before.
 		newCmd := exec.Command(cmd.Args[0], cmd.Args[1:]...)
 		newCmd.Dir = cmd.Dir
 		newCmd.Env = slices.Clone(cmd.Env)
-		out, err = newCmd.CombinedOutput()
+		err = testlog.RunWithTiming(t, fmt.Sprintf("VHS tape %q (second try)", td.Name), newCmd, testlog.DoNotSetStdoutAndStderr())
 	}
-	require.NoError(t, err, "Failed to run tape %q: %v: %s", td.Name, err, out)
+	require.NoError(t, err, "Failed to run tape %q, see vhs output above", td.Name)
 }
 
-func (td tapeData) String() string {
-	var str string
-	for _, o := range td.Outputs {
-		str += fmt.Sprintf("Output %q\n", o)
-	}
+func (td *tapeData) String() string {
+	str := fmt.Sprintf("Output %q\n", td.OutputFilename)
 	for s, v := range td.Settings {
 		switch vv := v.(type) {
 		case time.Duration:
@@ -334,16 +364,6 @@ func (td tapeData) String() string {
 	return str
 }
 
-func (td tapeData) Output() string {
-	var txt string
-	for _, o := range td.Outputs {
-		if strings.HasSuffix(o, ".txt") {
-			txt = o
-		}
-	}
-	return txt
-}
-
 func checkDataRaces(t *testing.T, raceLog string) {
 	t.Helper()
 
@@ -366,7 +386,7 @@ func checkDataRaces(t *testing.T, raceLog string) {
 		})
 
 	require.NoError(t, err, "TearDown: Check for races")
-	saveArtifactsForDebugOnCleanup(t, raceLogs)
+	testutils.MaybeSaveFilesAsArtifactsOnCleanup(t, raceLogs...)
 	for _, raceLog := range raceLogs {
 		checkDataRace(t, raceLog)
 	}
@@ -386,18 +406,28 @@ func checkDataRace(t *testing.T, raceLog string) {
 	t.Fatalf("Got a GO Race on vhs child:\n%s", out)
 }
 
-func (td tapeData) ExpectedOutput(t *testing.T, outputDir string) string {
+func (td *tapeData) SanitizedOutput(t *testing.T) string {
 	t.Helper()
 
-	outPath := filepath.Join(outputDir, td.Output())
+	td.sanitizeOutputOnce.Do(func() {
+		td.sanitizedOutput = td.sanitizeOutput(t)
+	})
+
+	return td.sanitizedOutput
+}
+
+func (td *tapeData) sanitizeOutput(t *testing.T) string {
+	t.Helper()
+
+	outPath := filepath.Join(td.OutputDir, td.OutputFilename)
 	out, err := os.ReadFile(outPath)
 	require.NoError(t, err, "Could not read output file of tape %q (%s)", td.Name, outPath)
-	got := string(out)
+	s := string(out)
 
 	// We need to format the output a little bit, since the txt file can have some noise at the beginning.
 	command := "> " + td.Command
 	maxCommandLen := 0
-	splitTmp := strings.Split(got, "\n")
+	splitTmp := strings.Split(s, "\n")
 	for _, str := range splitTmp {
 		maxCommandLen = max(maxCommandLen, utf8.RuneCountInString(str))
 	}
@@ -406,46 +436,34 @@ func (td tapeData) ExpectedOutput(t *testing.T, outputDir string) string {
 	}
 	for i, str := range splitTmp {
 		if strings.Contains(str, command) {
-			got = strings.Join(splitTmp[i:], "\n")
+			s = strings.Join(splitTmp[i:], "\n")
 			break
 		}
 	}
 
-	got = permissions.Z_ForTests_IdempotentPermissionError(got)
+	s = permissions.Z_ForTests_IdempotentPermissionError(s)
 
 	// Remove consecutive equal frames from vhs tapes.
 	framesSeparator := strings.Repeat(string(vhsFrameSeparator), vhsFrameSeparatorLength)
-	frames := slices.Compact(strings.Split(got, framesSeparator))
+	frames := slices.Compact(strings.Split(s, framesSeparator))
 	// Drop all the empty lines before each page separator, to remove the clutter.
 	for i, f := range frames {
 		frames[i] = vhsEmptyTrailingLinesRegex.ReplaceAllString(f, "\n")
 	}
-	got = strings.Join(frames, framesSeparator)
+	s = strings.Join(frames, framesSeparator)
 
 	// Drop all the socket references.
-	got = vhsUnixTargetRegex.ReplaceAllLiteralString(got, "unix:///authd/test_socket.sock")
+	s = vhsUnixTargetRegex.ReplaceAllLiteralString(s, "unix:///authd/test_socket.sock")
 
 	// Username may be split in multiple lines, so fix this not to break further checks.
-	got = vhsUserCheckRegex.ReplaceAllStringFunc(got, func(s string) string {
+	s = vhsUserCheckRegex.ReplaceAllStringFunc(s, func(s string) string {
 		return strings.ReplaceAll(s, "\n", "")
 	})
 
-	// Save the sanitized result on cleanup
-	t.Cleanup(func() {
-		if !t.Failed() {
-			return
-		}
-		baseName, _ := strings.CutSuffix(td.Output(), ".txt")
-		tempOutput := filepath.Join(t.TempDir(), fmt.Sprintf("%s_sanitized.txt", baseName))
-		require.NoError(t, os.WriteFile(tempOutput, []byte(got), 0600),
-			"TearDown: Saving sanitized output file %q", tempOutput)
-		saveArtifactsForDebug(t, []string{tempOutput})
-	})
-
-	return got
+	return s
 }
 
-func (td tapeData) PrepareTape(t *testing.T, testType vhsTestType, outputPath string) string {
+func (td *tapeData) PrepareTape(t *testing.T, testType vhsTestType) string {
 	t.Helper()
 
 	currentDir, err := os.Getwd()
@@ -482,24 +500,14 @@ func (td tapeData) PrepareTape(t *testing.T, testType vhsTestType, outputPath st
 			sleepDuration(defaultSleepValues[authdSleepDefault]).Milliseconds()),
 	}, "\n"))
 
-	tapePath := filepath.Join(outputPath, td.Name)
+	tapePath := filepath.Join(td.OutputDir, td.Name+".tape")
 	err = os.WriteFile(tapePath, tape, 0600)
 	require.NoError(t, err, "Setup: write tape file")
 
-	if testing.Verbose() {
-		t.Logf("Tape %q is now:\n%s", td.Name, tape)
-	}
-
-	artifacts := []string{tapePath}
-	for _, o := range td.Outputs {
-		artifacts = append(artifacts, filepath.Join(outputPath, o))
-	}
-	saveArtifactsForDebugOnCleanup(t, artifacts)
-
 	return tapePath
 }
 
-func evaluateTapeVariables(t *testing.T, tapeString string, td tapeData, testType vhsTestType) string {
+func evaluateTapeVariables(t *testing.T, tapeString string, td *tapeData, testType vhsTestType) string {
 	t.Helper()
 
 	for _, m := range vhsSleepOrWaitRegex.FindAllStringSubmatch(tapeString, -1) {
diff --git a/pam/tools/pam-runner/pam-runner.go b/pam/tools/pam-runner/pam-runner.go
index 288da528d0..ee86c19121 100644
--- a/pam/tools/pam-runner/pam-runner.go
+++ b/pam/tools/pam-runner/pam-runner.go
@@ -81,7 +81,7 @@ func main() {
 	args = append(defaultArgs, args...)
 
 	if pamService == "" {
-		pamService = "authd-cli"
+		pamService = "authd-cli-pam-service"
 	}
 	serviceFile, err := pam_test.CreateService(tmpDir, pamService, []pam_test.ServiceLine{
 		{Action: pam_test.Auth, Control: pam_test.SufficientRequisite, Module: execModule, Args: args},