diff --git a/src/org/openbravo/integration/google/signin/Authorize.java b/src/org/openbravo/integration/google/signin/Authorize.java
--- a/src/org/openbravo/integration/google/signin/Authorize.java
+++ b/src/org/openbravo/integration/google/signin/Authorize.java
@@ -1,5 +1,5 @@
 /************************************************************************************
- * Copyright (C) 2014-2015 Openbravo S.L.U.
+ * Copyright (C) 2014-2017 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -61,7 +61,7 @@
         message = message.replace("%0", Utility.messageBD(this, "OBIGSIG_Activate", lang));
         message = message.replaceAll(""", "\"");
 
-        goToRetry(resp, vars, message, "", "Error", "../security/Login_FS.html", false);
+        goToRetry(resp, vars, message, "", "Error", "../security/Login");
         return;
       }
 
@@ -69,8 +69,7 @@
           vars.getStringParameter("accessToken"));
 
       if (!tokenChecker.isValid()) {
-        goToRetry(resp, vars, tokenChecker.getErrorMessage(), "", "Error",
-            "../security/Login_FS.html", false);
+        goToRetry(resp, vars, tokenChecker.getErrorMessage(), "", "Error", "../security/Login");
         return;
       }
 
@@ -83,7 +82,7 @@
         log.error("No user associated to Google id {}", googleId);
         String message = Utility.messageBD(this, "OBIGSIG_NoDefaultConf", lang)
             .replaceAll("@@email@@", payload.getEmail()).replaceAll(""", "\"");
-        goToRetry(resp, vars, message, "", "Error", "../security/Login_FS.html", false);
+        goToRetry(resp, vars, message, "", "Error", "../security/Login");
         return;
       }
 
@@ -101,7 +100,7 @@
       vars.setSessionValue("#LOGGINGIN", "Y");
 
       // ...and finalize login checking license restrictions
-      checkLicenseAndGo(resp, vars, userId, userName, sessionId, false);
+      checkLicenseAndGo(resp, vars, userId, userName, sessionId);
     } catch (Exception e) {
       log.error("Error trying to authenticate using Google Auth service {} ", e.getMessage(), e);
     } finally {
@@ -134,7 +133,8 @@
   private User createUser(Payload payload) {
     OBIGSIGDefaults newUserDefaults;
 
-    OBCriteria<OBIGSIGDefaults> defaults = OBDal.getInstance().createCriteria(OBIGSIGDefaults.class);
+    OBCriteria<OBIGSIGDefaults> defaults = OBDal.getInstance()
+        .createCriteria(OBIGSIGDefaults.class);
     defaults.setFilterOnReadableClients(false);
     defaults.setFilterOnReadableOrganization(false);
 
@@ -156,7 +156,8 @@
 
     OBDal.getInstance().save(newUser);
 
-    OBIGSIGUserIdentifier userIdentifier = OBProvider.getInstance().get(OBIGSIGUserIdentifier.class);
+    OBIGSIGUserIdentifier userIdentifier = OBProvider.getInstance()
+        .get(OBIGSIGUserIdentifier.class);
     userIdentifier.setUserContact(newUser);
     userIdentifier.setClient(newUserDefaults.getRole().getClient());
     userIdentifier.setOrganization(newUserDefaults.getRole().getOrganization());