diff --git a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
index 51964e4..31b9c7a 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
@@ -47,12 +47,12 @@
         loginButton.setEnabled(false);
         loginButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-               Call<LoginJson> call = LoginService.accountLogin(passWordEditText.getText().toString(),uidEditText.getText().toString(),"","");
+               Call<LoginJson> call = LoginService.accountLogin(passWordEditText.getText().toString(),uidEditText.getText().toString());
                 call.enqueue(new Callback<LoginJson>(){
                     @Override
                     public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
-                       //LoginJson loginJson =response.body();
-                       //String token = loginJson.getToken();
+                        LoginJson loginJson =response.body();
+                        String token = loginJson.getToken();
                         Intent intent = new Intent(LoginActivity.this, MapsActivity.class);
                         startActivity(intent);
                     }
@@ -80,7 +80,8 @@
     public void afterTextChanged(Editable s) {
         if(passWordTextView.length()>7 && uidTextView.length()>0 ){
             loginButton.setEnabled(true);
-        } else{
+        }
+        else{
             loginButton.setEnabled(false);
         }
     }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
index edd014c..0c9c662 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
@@ -58,8 +58,6 @@
                 call.enqueue(new Callback<SignUpJson>(){
                     @Override
                     public void onResponse(Call<SignUpJson> call, Response<SignUpJson> response) {
-                        //SignUpJson signupJson =response.body();
-                        //String token = signupJson.getToken();
                         Intent intent = new Intent(SignUpActivity.this, LoginActivity.class);
                         startActivity(intent);
                     }
@@ -87,7 +85,8 @@
     public void afterTextChanged(Editable s) {
         if(passWordTextView.length()>7 && nameTextView.length()>0 ){
             signUpButton.setEnabled(true);
-        } else{
+        }
+        else{
             signUpButton.setEnabled(false);
         }
     }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java
index 3698467..d4264c3 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/LoginJson.java
@@ -6,11 +6,6 @@
     private String message;
     private String token;
 
-    public LoginJson(String message){
-        this.message=message;
-        this.token= UUID.randomUUID().toString();
-    }
-
     public String getMessage(){
         return message;
     }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java
index a658dc7..cc9a943 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java
@@ -19,14 +19,4 @@
     public void setUid(String uid) {
         this.uid = uid;
     }
-
-    private String token = null;
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
 }