diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java
index 2fc0b9b3..3bf124ae 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java
@@ -20,14 +20,19 @@ public class RESTBuilder {
     }
     public static <T> T getService(final Class<T> service, int timeout) {
 //        return getService(service, "192.168.2.13", 8080);
-        return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, timeout);
+        return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, true, timeout);
 
     }
+
     public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors) {
-        return getService(service, host, port, addInterceptors, 30);
+        return getService(service, host, port, addInterceptors, true, 30);
     }
 
-    public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, int timeout){
+    public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, boolean addEmsApi) {
+        return getService(service, host, port, addInterceptors, addEmsApi, 30);
+    }
+
+    public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout){
         OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
 
         clientBuilder.connectTimeout(timeout, TimeUnit.SECONDS);
@@ -38,7 +43,7 @@ public class RESTBuilder {
 
         OkHttpClient client = clientBuilder.build();
 
-        String endpoint = "http://" + host + ":" + port + "/ems-api/";
+        String endpoint = "http://" + host + ":" + port + "/" + (addEmsApi ? "ems-api/" : "");
 
         Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl(endpoint)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java
index 86228f37..cbf13c39 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java
@@ -38,7 +38,7 @@ public class LoginHelper {
         String host = CommonConst.Login.Azienda.host;
         int port = CommonConst.Login.Azienda.port;
 
-        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false);
+        LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false, true);
         service.loginAzienda(mCodAzienda).enqueue(new Callback<ServiceRESTResponse<LoginAziendaDTO>>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Response<ServiceRESTResponse<LoginAziendaDTO>> response) {