diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index eb2d7ae..4d24b8a 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -3,7 +3,7 @@
 import org.apache.commons.lang3.RandomStringUtils;
 
 public class Account {
-	private String name, pass, token;
+	private String id,name, pass, token;
 	private boolean login = false;
 
 	public Account(String userName, String userPass) {
@@ -11,6 +11,14 @@
 		setPass(userPass);
 	}
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	public String getName() {
 		return name;
 	}
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index b19c757..03b05a1 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -25,7 +25,7 @@
 		return theInstance;
 	}
 
-	public Account createAcount(String userID, String userName, String userPass) {
+	public Session createAcount(String userID, String userName, String userPass) {
 		System.out.println(userName);
 		if (!idSet.add(userID)) {
 			return null;
@@ -35,7 +35,7 @@
 		newAccount.formToken();
 		System.out.println(userID);
 
-		return newAccount;
+		return session;
 	}
 
 	public Account updateAccount(String userID, String userName, String userPass) {
@@ -57,10 +57,10 @@
 		}
 	}
 
-	public Account loginAccount(String userID, String userPass) {
+	public Session loginAccount(String userID, String userPass) {
 		if (idSet.contains(userID) && getAccount(userID).getPass().equals(userPass)) {
 			Accounts.getInstance().getAccount(userID).setLogin(true);
-			return getAccount(userID);
+			return session;
 		} else {
 			return null;
 		}
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index d9dd2d1..b4a7bbe 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -3,14 +3,14 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 
-import cactusServer.entities.Account;
+import cactusServer.entities.*;
 import cactusServer.models.Accounts;
 
 @Path("/accounts")
 public class AccountsRest {
 	@PUT
 	@Produces(MediaType.APPLICATION_JSON)
-	public Account loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
+	public Session loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
 		return Accounts.getInstance().loginAccount(userID, userPass);
 	}
 
@@ -23,7 +23,7 @@
 
 	@POST
 	@Produces(MediaType.APPLICATION_JSON)
-	public Account create(@FormParam("userID") String userID, @FormParam("userName") String userName,
+	public Session createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
 			@FormParam("userPass") String userPass) {
 		return Accounts.getInstance().createAcount(userID, userName, userPass);
 	}