diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index 4d24b8a..2d5319c 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -1,12 +1,17 @@
 package cactusServer.entities;
 
-import org.apache.commons.lang3.RandomStringUtils;
+import cactusServer.utils.RandomStringGenerator;
+import net.arnx.jsonic.JSONHint;
 
 public class Account {
-	private String id,name, pass, token;
+	private String id, name, token;
+	@JSONHint(ignore = true)
+	private String pass, uniqueID;
+	@JSONHint(ignore = true)
 	private boolean login = false;
 
-	public Account(String userName, String userPass) {
+	public Account(String userID, String userName, String userPass) {
+		setId(userID);
 		setName(userName);
 		setPass(userPass);
 	}
@@ -48,15 +53,15 @@
 	}
 
 	public String formToken() {
-		token = RandomStringUtils.random(64, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+		token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
 		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;
 	}
 }