diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index 2e9b412..a61e81f 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -1,7 +1,10 @@
 package cactusServer.entities;
 
+import net.arnx.jsonic.JSONHint;
+
 public class Account {
-	private String id,name, pass, token;
+	private String id,name, token,uniqueID;
+	@JSONHint(ignore = true)private String pass;
 	private boolean login = false;
 
 	public Account(String userID,String userName, String userPass) {
@@ -51,11 +54,11 @@
 		return token;
 	}
 
-	public Account getAccount(String token) {
-		if (this.token == token) {
-			return this;
-		} else {
-			return null;
-		}
+	public String getUniqueID() {
+		return uniqueID;
+	}
+
+	public void setUniqueID(String uniqueID) {
+		this.uniqueID = uniqueID;
 	}
 }
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 0494663..24a2091 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -5,8 +5,7 @@
 import cactusServer.entities.*;
 
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.*;
 
 @Singleton
 public class Accounts {
@@ -29,49 +28,42 @@
 	public Session createAcount(String userID, String userName, String userPass) {
 		String uniqueID = RandomStringGenerator.createUniqueString(64, RandomStringGenerator.ALPHA_NUMERIC, idSet);
 		idSet.add(uniqueID);
-		Account newAccount = new Account(userID,userName, userPass);
+		Account newAccount = new Account(userID, userName, userPass);
+		newAccount.setUniqueID(uniqueID);
 		accounts.add(newAccount);
 		newAccount.formToken();
-		session = new Session(newAccount,URI.create(uniqueID));
+		session = new Session(newAccount, URI.create(uniqueID));
 
 		return session;
 	}
 
-	public Account updateAccount(String userID, String userName, String userPass) {
-		if (idSet.contains(userID)) {
-			Accounts.getInstance().getAccount(userID).setName(userName);
-			Accounts.getInstance().getAccount(userID).setPass(userPass);
-			return Accounts.getInstance().getAccount(userID);
-		} else {
-			return null;
-		}
-	}
-
 	public Account getAccount(String token) {
 		Account editAccount;
-		for(int i=0;i<accounts.size();i++) {
+		for (int i = 0; i < accounts.size(); i++) {
 			editAccount = accounts.get(i);
-			if(editAccount.getToken().equals(token)) {
+			if (editAccount.getToken().equals(token)) {
 				return editAccount;
 			}
 		}
 		return null;
 	}
+
 	public Account getAccountByID(String userID) {
 		Account editAccount;
-		for(int i=0;i<accounts.size();i++) {
+		for (int i = 0; i < accounts.size(); i++) {
 			editAccount = accounts.get(i);
-			if(editAccount.getId().equals(userID)) {
+			if (editAccount.getId().equals(userID)) {
 				return editAccount;
 			}
 		}
 		return null;
 	}
-	public Account getAccountByuserName(String userName) {
+
+	public Account getAccountByName(String userName) {
 		Account editAccount;
-		for(int i=0;i<accounts.size();i++) {
+		for (int i = 0; i < accounts.size(); i++) {
 			editAccount = accounts.get(i);
-			if(editAccount.getName().equals(userName)) {
+			if (editAccount.getName().equals(userName)) {
 				return editAccount;
 			}
 		}
@@ -81,7 +73,7 @@
 	public Session loginAccount(String userID, String userPass) {
 		if (idSet.contains(userID) && getAccountByID(userID).getPass().equals(userPass)) {
 			Accounts.getInstance().getAccountByID(userID).setLogin(true);
-			session = new Session(Accounts.getInstance().getAccountByID(userID),URI.create(idSet.toString()));
+			session = new Session(Accounts.getInstance().getAccountByID(userID), URI.create(idSet.toString()));
 			return session;
 		} else {
 			return null;
@@ -89,17 +81,8 @@
 	}
 
 	public String logoutAccount(String token) {
+		Accounts.getInstance().getAccount(token).setLogin(false);
 		return "";
 	}
 
-	public String deleteAccount(String userID) {
-		if (idSet.contains(userID)) {
-			accounts.remove(userID);
-			idSet.remove(userID);
-			return "complated remove account";
-		} else {
-			return "not exist";
-		}
-	}
-
 }
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index b4a7bbe..5cc60ea 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -29,10 +29,10 @@
 	}
 
 	@GET
-	@Path("/{userID}")
+	@Path("/{uniqueID}")
 	@Produces(MediaType.APPLICATION_JSON)
-	public Account getAccount(@PathParam("userID") String userID) {
-		return Accounts.getInstance().getAccount(userID);
+	public Account getAccount(@PathParam("uniqueID") String uniqueID) {
+		return Accounts.getInstance().getAccount(uniqueID);
 	}
 
 }