diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java
index c55feffb..216cc61d 100644
--- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java
+++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java
@@ -304,7 +304,10 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 		var result = new HashSet<String>();
 		var lower  = key.toLowerCase();
 		var len    = key.length();
-		for (var tag : tags) result.add(tag.toLowerCase().startsWith(lower) ? key + tag.substring(len) : tag);
+		for (var tag : tags) {
+			if (tag.length() == key.length()) continue;
+			result.add(tag.toLowerCase().startsWith(lower) ? key + tag.substring(len) : tag);
+		}
 		return result.stream().sorted(String.CASE_INSENSITIVE_ORDER).toList();
 	}
 
diff --git a/frontend/src/routes/accounting/account.svelte b/frontend/src/routes/accounting/account.svelte
index 8a2f141d..35a4ff9e 100644
--- a/frontend/src/routes/accounting/account.svelte
+++ b/frontend/src/routes/accounting/account.svelte
@@ -115,7 +115,5 @@
 	</table>
 </fieldset>
 
-<span class="warn">TODO: Bearbeiten von Umsätzen</span>
-
 <EntryForm {account} {onSave} />
 {/if}
\ No newline at end of file