diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/SignUpJson.java b/src/main/java/org/ntlab/amaryllis/server/entities/SignUpJson.java
index 9a63106..4de2348 100644
--- a/src/main/java/org/ntlab/amaryllis/server/entities/SignUpJson.java
+++ b/src/main/java/org/ntlab/amaryllis/server/entities/SignUpJson.java
@@ -1,8 +1,15 @@
 package org.ntlab.amaryllis.server.entities;
 
+import java.util.UUID;
+
 public class SignUpJson {
     private String message;
     private String uid;
+    private String token;
+
+    public SignUpJson(){
+        this.token= UUID.randomUUID().toString();
+    }
 
     public String getMessage() {
         return message;
@@ -12,6 +19,10 @@
         return uid;
     }
 
+    public String getToken() {
+        return token;
+    }
+
     public void setMessage(String message) {
         this.message = message;
     }
@@ -19,4 +30,8 @@
     public void setUid(String uid) {
         this.uid = uid;
     }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
 }
diff --git a/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java b/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java
index baf59ce..7903db8 100644
--- a/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java
+++ b/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java
@@ -39,40 +39,25 @@
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public ArrayList<Account> getAccounts() {
-
-        String json = "";
-
-        System.out.println(json);
         return accounts.getList();
     }
 
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     public SignUpJson createAccount(@FormParam("name") String name, @FormParam("password") String password) {
+
         if (accounts.isRegisteredName(name)) {
-            throw  new WebApplicationException(400);
+            throw new WebApplicationException(400);
 
         } else {
 
             Account newAccount = accounts.createAccount(name, password);
-            SignUpJson response=new SignUpJson();
+            SignUpJson response = new SignUpJson();
             response.setMessage("success");
             response.setUid(newAccount.getUid());
+            newAccount.setToken(response.getToken());
 
             return response;
-//
-//            return new AbstractJson() {
-//                String message = "success";
-//                String uid = newAccount.getUid();
-//
-//                public String getMessage() {
-//                    return message;
-//                }
-//
-//                public String getUid() {
-//                    return uid;
-//                }
-//            };
         }
 
     }
@@ -85,11 +70,11 @@
         if (password.equals(account.getPassword())) {
 
             account.setToken(UUID.randomUUID().toString());
-            LoginJson loginJson=new LoginJson("success");
+            LoginJson loginJson = new LoginJson("success");
             return loginJson;
 
         } else {
-            throw  new WebApplicationException(400);
+            throw new WebApplicationException(400);
         }
     }
 
@@ -102,11 +87,11 @@
         if (password.equals(account.getPassword())) {
 
             account.setToken(UUID.randomUUID().toString());
-            LoginJson loginJson=new LoginJson("success");
+            LoginJson loginJson = new LoginJson("success");
             return loginJson;
 
         } else {
-            throw  new WebApplicationException(400);
+            throw new WebApplicationException(400);
         }
     }
 
@@ -114,14 +99,11 @@
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public Account getAccount(@PathParam("uid") String uid) {
-        class ResponseJson extends AbstractJson {
-            Account account = accounts.getAccount(uid);
 
-            public Account getAccount() {
-                return account;
-            }
-        }
-        throw  new WebApplicationException(400);
+        Account responseAccount = accounts.getAccount(uid);
+        if (responseAccount != null) return responseAccount;
+
+        throw new WebApplicationException(400);
 
     }