diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
index ef89b33385608638c4100df90deef47ab99d77a3..f490cbcb907c7021ed45f9c162d7f6f0dc56c7b6 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
@@ -26,7 +26,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;
 import com.google.api.client.googleapis.auth.oauth2.GoogleTokenResponse;
 import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
@@ -45,6 +45,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.Response;
+
+import com.google.api.client.json.gson.GsonFactory;
 import no.nibio.vips.logic.controller.session.UserBean;
 import no.nibio.vips.logic.entity.UserAuthenticationType;
 import no.nibio.vips.logic.entity.UserUuid;
@@ -109,14 +111,14 @@ public class LoginController extends HttpServlet {
                 
                 // Use code, make request to Google for getting token with user information
                 GoogleTokenResponse tokenResponse = new GoogleAuthorizationCodeTokenRequest(
-                        new NetHttpTransport(), 
-                        new JacksonFactory(),
+                        new NetHttpTransport(),
+                        new GsonFactory(),
                         System.getProperty("no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_ID"),
                         System.getProperty("no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_SECRET"),
                         authorizationCode,
                         Globals.PROTOCOL + "://" + ServletUtil.getServerName(request) + "/oauth2callback" 
                 ).execute();
-                GoogleIdToken idToken = GoogleIdToken.parse(new JacksonFactory(), tokenResponse.getIdToken());
+                GoogleIdToken idToken = GoogleIdToken.parse(new GsonFactory(), tokenResponse.getIdToken());
                 Payload payload = idToken.getPayload();
                 
                 // Try to find the user