diff --git a/scm-core/src/main/java/sonia/scm/web/UserAgent.java b/scm-core/src/main/java/sonia/scm/web/UserAgent.java
index 0647587a19..35e4060a91 100644
--- a/scm-core/src/main/java/sonia/scm/web/UserAgent.java
+++ b/scm-core/src/main/java/sonia/scm/web/UserAgent.java
@@ -24,18 +24,14 @@
 
 package sonia.scm.web;
 
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.common.base.Charsets;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-//~--- JDK imports ------------------------------------------------------------
-
 /**
  * The software agent that is acting on behalf of a user. The user agent
  * represents a browser or one of the repository client (svn, git or hg).
@@ -118,7 +114,7 @@ public final class UserAgent
 
     return Objects.equal(name, other.name)
       && Objects.equal(browser, other.browser)
-      && Objects.equal(basicAuthenticationCharset, basicAuthenticationCharset);
+      && Objects.equal(basicAuthenticationCharset, other.basicAuthenticationCharset);
   }
 
   /**
@@ -268,7 +264,7 @@ public final class UserAgent
     private boolean scmClient = false;
 
     /** basic authentication charset */
-    private Charset basicAuthenticationCharset = Charsets.ISO_8859_1;
+    private Charset basicAuthenticationCharset = StandardCharsets.ISO_8859_1;
   }