diff --git a/dist/changelogs/15.8_incremental.md b/dist/changelogs/15.8_incremental.md
index 2a3984a70..6717b81e7 100644
--- a/dist/changelogs/15.8_incremental.md
+++ b/dist/changelogs/15.8_incremental.md
@@ -1,8 +1,11 @@
 - Fix PowerShell-based shell sessions freezing after some time due to a wrong ErrorActionPreference. This issue especially broke local machine shell sessions on Windows system with PowerShell being the default shell
 - Fix VNC connections with 24-bit color depths getting rendered with switched colors
 - Fix SSH askpass failing for portable installations in a directory with non-ASCII characters due to an OpenSSH bug
+- Fix random ConcurrentModificationExceptions breaking the gui layout
 - Fix file browser download box buttons being usable and potentially misleading while a download was in progress
 - Fix startup error when process information access was blocked on Windows
+- Fix SSH config connections not allowing to specify an inline identity username
+- Fix SSH config connections not applying username specified for the identity
 - Fix LXD unsupported flag errors frequently showing up when searching for connections
 - Fix various rendering issues with svg icons
 - Fix many chinese translations
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoice.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoice.java
index a4b87b836..c93862901 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoice.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoice.java
@@ -22,7 +22,7 @@ public class IdentityChoice {
             ObjectProperty<IdentityValue> identity,
             boolean requireUser) {
         var i = new IdentityChoice(
-                gateway, identity, requireUser, requireUser, true, true, true, "identityChoice", "passwordAuthentication");
+                gateway, identity, true, requireUser, true, true, true, "identityChoice", "passwordAuthentication");
         return i.build();
     }
 
diff --git a/version b/version
index 94f2b8d30..7e5ba1bca 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-15.8-1
+15.8-2