diff --git a/app/src/main/java/io/xpipe/app/core/AppDisplayScale.java b/app/src/main/java/io/xpipe/app/core/AppDisplayScale.java
index 6d2311e05..cbb7f432b 100644
--- a/app/src/main/java/io/xpipe/app/core/AppDisplayScale.java
+++ b/app/src/main/java/io/xpipe/app/core/AppDisplayScale.java
@@ -1,5 +1,6 @@
 package io.xpipe.app.core;
 
+import io.xpipe.app.issue.ErrorEventFactory;
 import io.xpipe.app.prefs.AppPrefs;
 
 import javafx.stage.Screen;
@@ -8,6 +9,17 @@ public class AppDisplayScale {
 
     private static Double screenOutputScale;
 
+    public static void init() {
+        try {
+            Screen primary = Screen.getPrimary();
+            if (primary != null) {
+                screenOutputScale = primary.getOutputScaleX();
+            }
+        } catch (Exception e) {
+            ErrorEventFactory.fromThrowable(e).omit().expected().handle();
+        }
+    }
+
     public static boolean hasDefaultDisplayScale() {
         return getEffectiveDisplayScale() == 1.0;
     }
@@ -22,9 +34,6 @@ public class AppDisplayScale {
             }
         }
 
-        if (screenOutputScale == null) {
-            screenOutputScale = Screen.getPrimary().getOutputScaleX();
-        }
-        return screenOutputScale;
+        return screenOutputScale != null ? screenOutputScale : 1.0;
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/platform/PlatformInit.java b/app/src/main/java/io/xpipe/app/platform/PlatformInit.java
index 51321d08f..79594695b 100644
--- a/app/src/main/java/io/xpipe/app/platform/PlatformInit.java
+++ b/app/src/main/java/io/xpipe/app/platform/PlatformInit.java
@@ -87,6 +87,7 @@ public class PlatformInit {
             AppGpuCheck.check();
             AppFont.init();
             PlatformThread.runLaterIfNeededBlocking(() -> {
+                AppDisplayScale.init();
                 AppStyle.init();
                 AppTheme.init();
             });
diff --git a/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java
index 87f03e6a4..c779ae35e 100644
--- a/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java
+++ b/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java
@@ -81,9 +81,12 @@ public class KeeperPasswordManager implements PasswordManager {
     }
 
     @Override
-    public synchronized CredentialResult retrieveCredentials(String key) {
+    public synchronized CredentialResult retrieveCredentials(String rawKey) {
         // The copy UID button copies the whole URL in the Keeper UI. Why? ...
-        key = key.replaceFirst("https://\\w+\\.\\w+/vault/#detail/", "");
+        rawKey = rawKey.replaceFirst("https://\\w+\\.\\w+/vault/#detail/", "");
+
+        var username = rawKey.contains("/") ? rawKey.split("/", 2)[1] : null;
+        var key = rawKey.contains("/") ? rawKey.split("/", 2)[0] : rawKey;
 
         try {
             CommandSupport.isInLocalPathOrThrow("Keeper Commander CLI", "keeper-commander");
@@ -179,6 +182,11 @@ public class KeeperPasswordManager implements PasswordManager {
 
             var out = result[0]
                     .replace("\r\n", "\n")
+                    .replace("""
+                             Select your 2FA method:
+                               1. TOTP (Google and Microsoft Authenticator) \s
+                               q. Cancel login
+                             """, "")
                     .replace("""
                       Selection: Invalid entry, additional factors of authentication shown may be configured if not currently enabled.
                       Selection:\s
@@ -193,12 +201,11 @@ public class KeeperPasswordManager implements PasswordManager {
                              """, "")
                     .replace("Selection:", "")
                     .strip();
-            var err = result[1].replace("\r\n", "\n").replace("""
-                             EOF when reading a line
-                             """, "").strip();
+            var err = result[1].replace("\r\n", "\n").replace("EOF when reading a line", "").strip();
 
+            var outLines = out.lines().toList();
             var message = !err.isEmpty() ? out + "\n" + err : out;
-            if (exitCode != 0) {
+            if (exitCode != 0 || (outLines.size() > 0 && outLines.getLast().contains("Invalid entry"))) {
                 // Another password prompt was made
                 var wrongPw = out.contains("Enter password for") || exitCode == CommandControl.EXIT_TIMEOUT_EXIT_CODE;
                 if (wrongPw) {
@@ -215,13 +222,12 @@ public class KeeperPasswordManager implements PasswordManager {
 
             hasCompletedRequestInSession = true;
 
-            var outLines = out.lines().toList();
             if (outLines.isEmpty()) {
                 return null;
             }
 
             var lastLine = outLines.getLast();
-            return new CredentialResult(null, InPlaceSecretValue.of(lastLine));
+            return new CredentialResult(username, InPlaceSecretValue.of(lastLine));
         } catch (Exception ex) {
             ErrorEventFactory.fromThrowable(ex).handle();
             return null;