diff --git a/account/src/main/java/de/muehlencord/shared/account/util/UserNameActiveDirectoryRealm.java b/account/src/main/java/de/muehlencord/shared/account/util/UserNameActiveDirectoryRealm.java
index 4145d0f..feeeb55 100644
--- a/account/src/main/java/de/muehlencord/shared/account/util/UserNameActiveDirectoryRealm.java
+++ b/account/src/main/java/de/muehlencord/shared/account/util/UserNameActiveDirectoryRealm.java
@@ -21,8 +21,8 @@ public class UserNameActiveDirectoryRealm extends ActiveDirectoryRealm {
         UsernamePasswordToken upToken = (UsernamePasswordToken) token;
         // Binds using the username and password provided by the user.
         LdapContext ctx = null;
-        try {
-            String userName = upToken.getUsername();
+        String userName = upToken.getUsername();
+        try {            
             if (principalSuffix != null) {
                 if (!userName.contains(principalSuffix))
                     userName += principalSuffix;
@@ -33,6 +33,6 @@ public class UserNameActiveDirectoryRealm extends ActiveDirectoryRealm {
             LdapUtils.closeContext(ctx);
         }
 
-        return buildAuthenticationInfo(upToken.getUsername(), upToken.getPassword());
+        return buildAuthenticationInfo(userName, upToken.getPassword());
     }
 }