diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java
index b898ba9..9bd6c62 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java
@@ -89,7 +89,7 @@
 
   public boolean filterSessionAuth(final DynamicItem<WebSession> webSession,
       HttpServletRequest request) {
-    request.setAttribute("gerrit-username", webSession.get().getCurrentUser()
+    request.setAttribute("gerrit-username", webSession.get().getUser()
         .getUserName());
     request.setAttribute("gerrit-token", webSession.get().getSessionId());
     return true;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
index c76065e..5014fa5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
@@ -96,7 +96,7 @@
       return null;
     }
 
-    if (!session.getCurrentUser().getUserName().equals(username)) {
+    if (!session.getUser().getUserName().equals(username)) {
       log.warn("Gerrit session " + session.getSessionId()
           + " is not assigned to user " + username);
       return null;
@@ -118,7 +118,7 @@
     try {
       AuthResult authResp = accountManager.authenticate(who);
       webSession.get().login(authResp, false);
-    } catch (AccountException e) {
+    } catch (Exception e) {
       log.warn("Authentication failed for '" + username + "'", e);
       return null;
     }