diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index 7b27566..2d5319c 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -1,5 +1,6 @@
 package cactusServer.entities;
 
+import cactusServer.utils.RandomStringGenerator;
 import net.arnx.jsonic.JSONHint;
 
 public class Account {
@@ -52,7 +53,7 @@
 	}
 
 	public String formToken() {
-		token = RandomStringGenerator.createRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
+		token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
 		return token;
 	}
 
diff --git a/src/main/java/cactusServer/entities/RandomStringGenerator.java b/src/main/java/cactusServer/entities/RandomStringGenerator.java
deleted file mode 100644
index 921c7c3..0000000
--- a/src/main/java/cactusServer/entities/RandomStringGenerator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cactusServer.entities;
-
-import java.util.Set;
-
-import org.apache.commons.lang3.RandomStringUtils;
-
-public class RandomStringGenerator {
-	public static final String ALPHA_NUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-	static public String createRandomString(int num, String seed) {
-		return RandomStringUtils.random(num, seed);
-	}
-
-	static public boolean checkString(String str, Set<String> set) {
-		return set.contains(str);
-	}
-
-	static public String createUniqueString(int num, String seed, Set<String> set) {
-		String str;
-		do {
-			str = createRandomString(num, seed);
-		} while (checkString(str, set));
-		return str;
-	}
-}
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 53726d0..027d42c 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -4,6 +4,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import cactusServer.entities.*;
+import cactusServer.utils.RandomStringGenerator;
 
 import java.net.URI;
 import java.util.*;
@@ -88,7 +89,7 @@
 			Accounts.getInstance().getAccountByID(userID).setLogin(true);
 			Accounts.getInstance().getAccountByID(userID).formToken();
 			session = new Session(Accounts.getInstance().getAccountByID(userID),
-					URI.create("CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID()));
+					URI.create("/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID()));
 			return session;
 		} else {
 			return null;
diff --git a/src/main/java/cactusServer/utils/RandomStringGenerator.java b/src/main/java/cactusServer/utils/RandomStringGenerator.java
new file mode 100644
index 0000000..522e32c
--- /dev/null
+++ b/src/main/java/cactusServer/utils/RandomStringGenerator.java
@@ -0,0 +1,29 @@
+package cactusServer.utils;
+
+import java.util.Set;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+public class RandomStringGenerator {
+	public static final String ALPHA_NUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+	private RandomStringGenerator() {
+
+	}
+
+	static public String generateRandomString(int num, String seed) {
+		return RandomStringUtils.random(num, seed);
+	}
+
+	static public boolean checkString(String str, Set<String> set) {
+		return set.contains(str);
+	}
+
+	static public String createUniqueString(int num, String seed, Set<String> set) {
+		String str;
+		do {
+			str = generateRandomString(num, seed);
+		} while (checkString(str, set));
+		return str;
+	}
+}