diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 309f3f9..53726d0 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -1,6 +1,7 @@
 package cactusServer.models;
 
 import javax.inject.Singleton;
+import javax.servlet.http.HttpServletResponse;
 
 import cactusServer.entities.*;
 
@@ -13,6 +14,7 @@
 	private ArrayList<Account> accounts = new ArrayList<>(10000);
 	private HashSet<String> idSet = new HashSet<>(10000);
 	private Session session;
+	private HttpServletResponse response;
 
 	private Accounts() {
 
@@ -37,7 +39,7 @@
 		return session;
 	}
 
-	public Account getAccount(String token) {
+	public Account getAccountToken(String token) {
 		Account editAccount;
 		for (int i = 0; i < accounts.size(); i++) {
 			editAccount = accounts.get(i);
@@ -84,8 +86,9 @@
 	public Session loginAccount(String userID, String userPass) {
 		if (getAccountByID(userID).getPass().equals(userPass)) {
 			Accounts.getInstance().getAccountByID(userID).setLogin(true);
+			Accounts.getInstance().getAccountByID(userID).formToken();
 			session = new Session(Accounts.getInstance().getAccountByID(userID),
-					URI.create(Accounts.getInstance().getAccountByID(userID).getUniqueID()));
+					URI.create("CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID()));
 			return session;
 		} else {
 			return null;
@@ -93,7 +96,7 @@
 	}
 
 	public String logoutAccount(String token) {
-		Accounts.getInstance().getAccount(token).setLogin(false);
+		Accounts.getInstance().getAccountToken(token).setLogin(false);
 		return "";
 	}