diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 8fcf2b4..f505d40 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -35,8 +35,8 @@
 		return newAccount;
 	}
 
-	public ArrayList<Account> getAccountList() {
-		return this.accounts;
+	public static ArrayList<Account> getAccountList() {
+		return accounts;
 	}
 
 	public static Account getAccount(String userID) {
@@ -44,6 +44,7 @@
 		for(int i=0;i<accounts.size();i++) {
 			if(accounts.get(i).getId() == userID) {
 				editAccount = accounts.get(i);
+				break;
 			}
 		}
 		return editAccount;