diff --git a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java
index 66581551e..509bc05c8 100644
--- a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java
+++ b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java
@@ -68,7 +68,7 @@ public class SshAgentKeyListComp extends SimpleRegionBuilder {
                                 entryButton.setMaxWidth(400);
                                 entryButton.getStyleClass().add(Styles.FLAT);
                                 entryButton.setOnAction(e -> {
-                                    value.setValue(useKeyNames && entry.getName() != null ? entry.getName() : entry.toString());
+                                    value.setValue(useKeyNames && entry.getName() != null ? entry.getName() : entry.getType() + " " + entry.getPublicKey());
                                     popover.hide();
                                     e.consume();
                                 });
diff --git a/app/src/main/java/io/xpipe/app/cred/SshIdentityStateManager.java b/app/src/main/java/io/xpipe/app/cred/SshIdentityStateManager.java
index 4b09a4ec3..88d064c66 100644
--- a/app/src/main/java/io/xpipe/app/cred/SshIdentityStateManager.java
+++ b/app/src/main/java/io/xpipe/app/cred/SshIdentityStateManager.java
@@ -45,7 +45,7 @@ public class SshIdentityStateManager {
 
             if (external && !gpgRunning && !opensshRunning) {
                 throw ErrorEventFactory.expected(new IllegalStateException(
-                        "An external password manager agent is running, but XPipe requested to use another SSH agent. You have to disable the "
+                        "An external password manager agent is running, but XPipe requested to use another SSH agent. You have to disable the other running "
                                 + "password manager agent first."));
             }
 
diff --git a/app/src/main/java/io/xpipe/app/pwman/KeePassXcProxyClient.java b/app/src/main/java/io/xpipe/app/pwman/KeePassXcProxyClient.java
index 195a853d4..f285539f1 100644
--- a/app/src/main/java/io/xpipe/app/pwman/KeePassXcProxyClient.java
+++ b/app/src/main/java/io/xpipe/app/pwman/KeePassXcProxyClient.java
@@ -262,8 +262,9 @@ public class KeePassXcProxyClient {
 
         Map<String, Object> responseMap = jsonToMap(responseJson);
         if (responseMap.containsKey("error")) {
-            throw ErrorEventFactory.expected(
-                    new IllegalStateException(responseMap.get("error").toString()));
+            var err = responseMap.get("error").toString();
+            var msg = "No logins found".equals(err) ? "No logins found for " + url : err;
+            throw ErrorEventFactory.expected(new IllegalStateException(msg));
         }
 
         if (responseMap.containsKey("message") && responseMap.containsKey("nonce")) {
diff --git a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java
index dafb480f8..0177ae270 100644
--- a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java
+++ b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java
@@ -79,7 +79,7 @@ public class OnePasswordManager implements PasswordManager {
         return new OptionsBuilder()
                 .nameAndDescription("onePasswordManagerAccount")
                 .addString(account)
-                .hide(account.isNull().and(availableAccounts.emptyProperty()))
+                .hide(account.isNull().and(availableAccounts.sizeProperty().lessThan(2)))
                 .nameAndDescription("passwordManagerTest")
                 .addComp(new PasswordManagerTestComp(true))
                 .nameAndDescription("passwordManagerKeyStrategy")