diff --git a/WebServices/authenticator/src/main/java/br/ufrn/imd/authenticator/controller/AuthenticatorController.java b/WebServices/authenticator/src/main/java/br/ufrn/imd/authenticator/controller/AuthenticatorController.java
index 93492674ceab6ab2ab385045447d6e8c5767f7c0..a2eb5d5005e3713e397e49c90c77bc19d045074b 100644
--- a/WebServices/authenticator/src/main/java/br/ufrn/imd/authenticator/controller/AuthenticatorController.java
+++ b/WebServices/authenticator/src/main/java/br/ufrn/imd/authenticator/controller/AuthenticatorController.java
@@ -11,11 +11,11 @@ import javax.security.auth.message.AuthException;
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("auth")
+@RequestMapping("/banking/login")
 public class AuthenticatorController {
     private final AuthenticatorService service;
 
-    @PostMapping("/login")
+    @PostMapping
     @ResponseStatus(HttpStatus.OK)
     public Client authenticate(@RequestBody CredentialsMessage credentials) throws AuthException {
         return service.authenticate(credentials.getNumber(), credentials.getPassword());
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
index aae40752f235211ad845d765b70b42ceacf726f4..58f94424594b6764560ffe38f95517d10dafc1c0 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
@@ -1,21 +1,12 @@
 package br.ufrn.imd.client.utils;
 
-import br.ufrn.imd.client.domain.Account;
 import br.ufrn.imd.client.domain.Client;
-import br.ufrn.imd.client.utils.message.DepositMessage;
-import br.ufrn.imd.client.utils.message.TransferMessage;
-import br.ufrn.imd.client.utils.message.WithdrawalMessage;
+import br.ufrn.imd.client.utils.message.CredentialsMessage;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.net.MalformedURLException;
-import java.rmi.Naming;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
 import java.util.Scanner;
 
 import static ufrn.imd.utils.NameSpace.*;
@@ -50,17 +41,19 @@ public class MachineState {
 
     public void login() {
         System.out.println(">>> Please enter your bank account number");
-//        String accountNumber = sc.nextLine();
-//
-//        ResponseEntity<Client> response = restTemplate.getForEntity(HOST_AUTHENTICATOR_SERVICE, Client.class);
-//
-//        if(response.getStatusCodeValue() == 200) {
+        String accountNumber = sc.nextLine();
+
+        System.out.println(">>> Please enter your password");
+        String password = sc.nextLine();
+
+        ResponseEntity<Client> response = restTemplate.postForEntity(HOST_AUTHENTICATOR_SERVICE,
+                new CredentialsMessage(accountNumber, password), Client.class);
+        if(response.getStatusCodeValue() == 200) {
             state = INITIAL;
-//            this.client = response.getBody();
-        this.client = new Client(1);
-//        } else {
-//            System.out.println(">>> Bad credentials");
-//        }
+            this.client = response.getBody();
+        } else {
+            System.out.println(">>> Bad credentials");
+        }
 
         try {
             Thread.sleep(1000);
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java
index 624c024a4df4a6d4d10514ac8fe8fd3c9df9da72..5515d6f87172e32bafb5b87d818766c02dec61e4 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java
@@ -1,12 +1,12 @@
 package ufrn.imd.utils;
 
 public class NameSpace {
-    public final static Integer PORT_AUTHENTICATOR_SERVICE = 1905;
+    public final static Integer PORT_AUTHENTICATOR_SERVICE = 8080;
     public final static Integer PORT_WITHDRAWAL_SERVICE = 8080;
     public static final Integer PORT_DEPOSIT_SERVICE = 8080;
     public static final Integer PORT_BALANCE_SERVICE = 8080;
     public static final Integer PORT_TRANSFER_SERVICE = 8080;
-    public final static String HOST_AUTHENTICATOR_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_AUTHENTICATOR_SERVICE, "authenticator");
+    public final static String HOST_AUTHENTICATOR_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_AUTHENTICATOR_SERVICE, "/gateway/authenticator/banking/login");
     public final static String HOST_WITHDRAWAL_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_WITHDRAWAL_SERVICE, "/gateway/withdrawal/banking/client");
     public static final String HOST_DEPOSIT_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_DEPOSIT_SERVICE, "/gateway/deposit/banking/client");
     public static final String HOST_BALANCE_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_BALANCE_SERVICE, "/gateway/balance/banking/client");
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/message/CredentialsMessage.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/message/CredentialsMessage.java
new file mode 100644
index 0000000000000000000000000000000000000000..234192784d6603a7f9a248c9ac444356ac68bc0c
--- /dev/null
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/message/CredentialsMessage.java
@@ -0,0 +1,15 @@
+package br.ufrn.imd.client.utils.message;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class CredentialsMessage implements Serializable {
+    private static final long serialVersionUID = 2L;
+
+    private String number;
+    private String password;
+}