diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
index a1976d03ac49e3e69139777a56ef3a45b7f181d9..067a1354e57bf5fc073a9bff5d34ad9d5bbf2915 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
@@ -46,26 +46,26 @@ public class AccountService implements Resettable, AccessAllEntities<Account>
 	@Override
 	public List<Account> getAllEntitiesAsc()
 	{
-		List<Account> accounts = accountRepository.findAllByType(AccountType.ALL);
-		accounts.addAll(accountRepository.findAllByTypeOrderByNameAsc(AccountType.CUSTOM));
+		final List<Account> accounts = accountRepository.findAllByTypeOrderByNameAsc(AccountType.CUSTOM);
 		accounts.sort((a1, a2) -> new NaturalOrderComparator().compare(a1.getName(), a2.getName()));
+		accounts.addAll(0, accountRepository.findAllByType(AccountType.ALL));
 		return accounts;
 	}
 
 	public List<Account> getAllActivatedAccountsAsc()
 	{
-		List<Account> accounts = accountRepository.findAllByType(AccountType.ALL);
-		accounts.addAll(accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS));
+		List<Account> accounts = accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS);
 		accounts.sort((a1, a2) -> new NaturalOrderComparator().compare(a1.getName(), a2.getName()));
+		accounts.addAll(0, accountRepository.findAllByType(AccountType.ALL));
 		return accounts;
 	}
 
 	public List<Account> getAllReadableAccounts()
 	{
-		List<Account> accounts = accountRepository.findAllByType(AccountType.ALL);
-		accounts.addAll(accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS));
+		List<Account> accounts = accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS);
 		accounts.addAll(accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.READ_ONLY));
 		accounts.sort((a1, a2) -> new NaturalOrderComparator().compare(a1.getName(), a2.getName()));
+		accounts.addAll(0, accountRepository.findAllByType(AccountType.ALL));
 		return accounts;
 	}