diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index a61e81f..92b010b 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -4,7 +4,7 @@
 
 public class Account {
 	private String id,name, token,uniqueID;
-	@JSONHint(ignore = true)private String pass;
+	private String pass;
 	private boolean login = false;
 
 	public Account(String userID,String userName, String userPass) {
@@ -28,8 +28,8 @@
 	public void setName(String name) {
 		this.name = name;
 	}
-
-	public String getPass() {
+	
+	@JSONHint(ignore = true)public String getPass() {
 		return pass;
 	}
 
@@ -37,7 +37,7 @@
 		this.pass = pass;
 	}
 
-	public boolean isLogin() {
+	@JSONHint(ignore = true)public boolean isLogin() {
 		return login;
 	}
 
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 24a2091..309f3f9 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -10,8 +10,8 @@
 @Singleton
 public class Accounts {
 	private static Accounts theInstance = null;
-	private ArrayList<Account> accounts = new ArrayList<>();
-	private HashSet<String> idSet = new HashSet<>();
+	private ArrayList<Account> accounts = new ArrayList<>(10000);
+	private HashSet<String> idSet = new HashSet<>(10000);
 	private Session session;
 
 	private Accounts() {
@@ -26,7 +26,7 @@
 	}
 
 	public Session createAcount(String userID, String userName, String userPass) {
-		String uniqueID = RandomStringGenerator.createUniqueString(64, RandomStringGenerator.ALPHA_NUMERIC, idSet);
+		String uniqueID = RandomStringGenerator.createUniqueString(12, RandomStringGenerator.ALPHA_NUMERIC, idSet);
 		idSet.add(uniqueID);
 		Account newAccount = new Account(userID, userName, userPass);
 		newAccount.setUniqueID(uniqueID);
@@ -69,11 +69,23 @@
 		}
 		return null;
 	}
-
+	
+	public Account getAccountByuniqueID(String uniqueID) {
+		Account editAccount;
+		for (int i = 0; i < accounts.size(); i++) {
+			editAccount = accounts.get(i);
+			if (editAccount.getUniqueID().equals(uniqueID)) {
+				return editAccount;
+			}
+		}
+		return null;
+	}
+	
 	public Session loginAccount(String userID, String userPass) {
-		if (idSet.contains(userID) && getAccountByID(userID).getPass().equals(userPass)) {
+		if (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(Accounts.getInstance().getAccountByID(userID).getUniqueID()));
 			return session;
 		} else {
 			return null;
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index 5cc60ea..c29d730 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -32,7 +32,7 @@
 	@Path("/{uniqueID}")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Account getAccount(@PathParam("uniqueID") String uniqueID) {
-		return Accounts.getInstance().getAccount(uniqueID);
+		return Accounts.getInstance().getAccountByuniqueID(uniqueID);
 	}
 
 }