diff --git a/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java
index 5efaf6eb36..8ea713dc28 100644
--- a/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java
+++ b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java
@@ -240,7 +240,15 @@ public class BasicAuthenticationFilter extends HttpFilter
         }
         catch (AuthenticationException ex)
         {
-          logger.warn("authentication failed", ex);
+          if (logger.isTraceEnabled())
+          {
+            logger.trace("authentication failed for user ".concat(username),
+              ex);
+          }
+          else if (logger.isWarnEnabled())
+          {
+            logger.warn("authentication failed for user {}", username);
+          }
         }
       }
       else if (logger.isWarnEnabled())
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
index e96ff0e34f..3dec0e2d01 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
@@ -150,6 +150,15 @@ public class AuthenticationResource
     }
     catch (AuthenticationException ex)
     {
+      if (logger.isTraceEnabled())
+      {
+        logger.trace("authentication failed for user ".concat(username), ex);
+      }
+      else if (logger.isWarnEnabled())
+      {
+        logger.warn("authentication failed for user {}", username);
+      }
+
       throw new WebApplicationException(Response.Status.UNAUTHORIZED);
     }