diff --git a/mechanism/oauth2/src/main/java/org/wildfly/security/mechanism/oauth2/OAuth2Client.java b/mechanism/oauth2/src/main/java/org/wildfly/security/mechanism/oauth2/OAuth2Client.java
index ec78a73eea..4e687cda64 100644
--- a/mechanism/oauth2/src/main/java/org/wildfly/security/mechanism/oauth2/OAuth2Client.java
+++ b/mechanism/oauth2/src/main/java/org/wildfly/security/mechanism/oauth2/OAuth2Client.java
@@ -18,6 +18,11 @@
 
 package org.wildfly.security.mechanism.oauth2;
 
+import static org.wildfly.common.Assert.assertTrue;
+
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
 import org.wildfly.common.bytes.ByteStringBuilder;
 import org.wildfly.common.iteration.ByteIterator;
 import org.wildfly.security.auth.callback.CredentialCallback;
@@ -27,11 +32,6 @@
 import org.wildfly.security.mechanism.AuthenticationMechanismException;
 import org.wildfly.security.sasl.util.StringPrep;
 
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import static org.wildfly.common.Assert.assertTrue;
-
 /**
  * Implementation of the client side of the OAuth2 SASL mechanism.
  *