diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 75f5a9f..0494663 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -12,7 +12,7 @@
 public class Accounts {
 	private static Accounts theInstance = null;
 	private ArrayList<Account> accounts = new ArrayList<>();
-	private HashSet<String> idSet = new HashSet<String>();
+	private HashSet<String> idSet = new HashSet<>();
 	private Session session;
 
 	private Accounts() {
@@ -28,9 +28,7 @@
 
 	public Session createAcount(String userID, String userName, String userPass) {
 		String uniqueID = RandomStringGenerator.createUniqueString(64, RandomStringGenerator.ALPHA_NUMERIC, idSet);
-		if (!idSet.add(uniqueID)) {
-			return null;
-		}
+		idSet.add(uniqueID);
 		Account newAccount = new Account(userID,userName, userPass);
 		accounts.add(newAccount);
 		newAccount.formToken();
@@ -59,10 +57,31 @@
 		}
 		return null;
 	}
+	public Account getAccountByID(String userID) {
+		Account editAccount;
+		for(int i=0;i<accounts.size();i++) {
+			editAccount = accounts.get(i);
+			if(editAccount.getId().equals(userID)) {
+				return editAccount;
+			}
+		}
+		return null;
+	}
+	public Account getAccountByuserName(String userName) {
+		Account editAccount;
+		for(int i=0;i<accounts.size();i++) {
+			editAccount = accounts.get(i);
+			if(editAccount.getName().equals(userName)) {
+				return editAccount;
+			}
+		}
+		return null;
+	}
 
 	public Session loginAccount(String userID, String userPass) {
-		if (idSet.contains(userID) && getAccount(userID).getPass().equals(userPass)) {
-			Accounts.getInstance().getAccount(userID).setLogin(true);
+		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()));
 			return session;
 		} else {
 			return null;