diff --git a/codelist/models.py b/codelist/models.py
index c455d1e1..10c197a0 100644
--- a/codelist/models.py
+++ b/codelist/models.py
@@ -53,8 +53,9 @@ class KonovaCode(models.Model):
         if self.parent:
             ret_val += self.parent.long_name + " > "
         ret_val += self.long_name
-        if self.short_name:
-            ret_val += " ({})".format(self.short_name)
+        if self.short_name and self.short_name != self.long_name:
+            # Only add short name, if we won't have stupid repition like 'thing a (thing a)' due to misused long-short names
+            ret_val += f" ({self.short_name})"
         return ret_val
 
     @property
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index c8c53a96..4e29c29e 100644
Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 444d60ef..d50cd07e 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-06 13:06+0200\n"
+"POT-Creation-Date: 2021-10-13 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,7 +63,7 @@ msgstr "Bezeichnung"
 msgid "An explanatory name"
 msgstr "Aussagekräftiger Titel"
 
-#: compensation/forms/forms.py:49
+#: compensation/forms/forms.py:49 ema/forms.py:47 ema/forms.py:105
 msgid "Compensation XY; Location ABC"
 msgstr "Kompensation XY; Flur ABC"
 
@@ -76,7 +76,7 @@ msgid "Select fundings for this compensation"
 msgstr "Wählen Sie ggf. Fördermittelprojekte"
 
 #: compensation/forms/forms.py:67 compensation/forms/forms.py:104
-#: compensation/forms/forms.py:239 intervention/forms/forms.py:63
+#: compensation/forms/forms.py:155 intervention/forms/forms.py:63
 #: intervention/forms/forms.py:80 intervention/forms/forms.py:96
 #: intervention/forms/forms.py:112
 msgid "Click for selection"
@@ -108,74 +108,74 @@ msgstr "Kommentar"
 msgid "Additional comment"
 msgstr "Zusätzlicher Kommentar"
 
-#: compensation/forms/forms.py:95
-#: compensation/templates/compensation/detail/compensation/view.html:35
-msgid "compensates intervention"
-msgstr "kompensiert Eingriff"
-
-#: compensation/forms/forms.py:97
-msgid "Select the intervention for which this compensation compensates"
-msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
-
-#: compensation/forms/forms.py:122
-msgid "New compensation"
-msgstr "Neue Kompensation"
-
-#: compensation/forms/forms.py:177
-msgid "Edit compensation"
-msgstr "Bearbeite Kompensation"
-
-#: compensation/forms/forms.py:228
+#: compensation/forms/forms.py:93
 #: compensation/templates/compensation/detail/eco_account/view.html:58
 #: ema/templates/ema/detail/view.html:42 intervention/forms/forms.py:101
 #: intervention/templates/intervention/detail/view.html:56
 msgid "Conservation office"
 msgstr "Eintragungsstelle"
 
-#: compensation/forms/forms.py:230
+#: compensation/forms/forms.py:95
 msgid "Select the responsible office"
 msgstr "Verantwortliche Stelle"
 
-#: compensation/forms/forms.py:244
+#: compensation/forms/forms.py:109
 #: compensation/templates/compensation/detail/eco_account/view.html:62
 #: ema/templates/ema/detail/view.html:46 intervention/forms/forms.py:129
 #: intervention/templates/intervention/detail/view.html:60
 msgid "Conservation office file number"
 msgstr "Aktenzeichen Eintragungsstelle"
 
-#: compensation/forms/forms.py:250 intervention/forms/forms.py:135
+#: compensation/forms/forms.py:115 intervention/forms/forms.py:135
 msgid "ETS-123/ABC.456"
 msgstr ""
 
-#: compensation/forms/forms.py:256
+#: compensation/forms/forms.py:121
 msgid "Eco-account handler"
 msgstr "Maßnahmenträger"
 
-#: compensation/forms/forms.py:260
+#: compensation/forms/forms.py:125
 msgid "Who handles the eco-account"
 msgstr "Wer für die Herrichtung des Ökokontos verantwortlich ist"
 
-#: compensation/forms/forms.py:263 intervention/forms/forms.py:148
+#: compensation/forms/forms.py:128 intervention/forms/forms.py:148
 msgid "Company Mustermann"
 msgstr "Firma Mustermann"
 
-#: compensation/forms/forms.py:280
+#: compensation/forms/forms.py:146
+#: compensation/templates/compensation/detail/compensation/view.html:35
+msgid "compensates intervention"
+msgstr "kompensiert Eingriff"
+
+#: compensation/forms/forms.py:148
+msgid "Select the intervention for which this compensation compensates"
+msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
+
+#: compensation/forms/forms.py:173
+msgid "New compensation"
+msgstr "Neue Kompensation"
+
+#: compensation/forms/forms.py:231
+msgid "Edit compensation"
+msgstr "Bearbeite Kompensation"
+
+#: compensation/forms/forms.py:299
 msgid "New Eco-Account"
 msgstr "Neues Ökokonto"
 
-#: compensation/forms/forms.py:289
+#: compensation/forms/forms.py:308
 msgid "Eco-Account XY; Location ABC"
 msgstr "Ökokonto XY; Flur ABC"
 
-#: compensation/forms/forms.py:338
+#: compensation/forms/forms.py:360
 msgid "Available Surface"
 msgstr "Verfügbare Fläche"
 
-#: compensation/forms/forms.py:341
+#: compensation/forms/forms.py:363
 msgid "The amount that can be used for deductions"
 msgstr "Die für Abbuchungen zur Verfügung stehende Menge"
 
-#: compensation/forms/forms.py:362
+#: compensation/forms/forms.py:384
 msgid "Edit Eco-Account"
 msgstr "Ökokonto bearbeiten"
 
@@ -769,46 +769,46 @@ msgstr "Eingriffsverursacher"
 msgid "Compensation {} added"
 msgstr "Kompensation {} hinzugefügt"
 
-#: compensation/views/compensation_views.py:132
+#: compensation/views/compensation_views.py:131
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"
 
-#: compensation/views/compensation_views.py:211
-#: compensation/views/eco_account_views.py:278 ema/views.py:128
-#: intervention/views.py:428
+#: compensation/views/compensation_views.py:210
+#: compensation/views/eco_account_views.py:277 ema/views.py:174
+#: intervention/views.py:427
 msgid "Log"
 msgstr "Log"
 
-#: compensation/views/compensation_views.py:232
+#: compensation/views/compensation_views.py:231
 msgid "Compensation removed"
 msgstr "Kompensation entfernt"
 
-#: compensation/views/compensation_views.py:251
-#: compensation/views/eco_account_views.py:377 ema/views.py:250
-#: intervention/views.py:124
+#: compensation/views/compensation_views.py:250
+#: compensation/views/eco_account_views.py:376 ema/views.py:327
+#: intervention/views.py:123
 msgid "Document added"
 msgstr "Dokument hinzugefügt"
 
-#: compensation/views/compensation_views.py:307
-#: compensation/views/eco_account_views.py:321 ema/views.py:194
+#: compensation/views/compensation_views.py:306
+#: compensation/views/eco_account_views.py:320 ema/views.py:271
 msgid "State added"
 msgstr "Zustand hinzugefügt"
 
-#: compensation/views/compensation_views.py:326
-#: compensation/views/eco_account_views.py:340 ema/views.py:213
+#: compensation/views/compensation_views.py:325
+#: compensation/views/eco_account_views.py:339 ema/views.py:290
 msgid "Action added"
 msgstr "Maßnahme hinzugefügt"
 
-#: compensation/views/compensation_views.py:345
-#: compensation/views/eco_account_views.py:359 ema/views.py:232
+#: compensation/views/compensation_views.py:344
+#: compensation/views/eco_account_views.py:358 ema/views.py:309
 msgid "Deadline added"
 msgstr "Frist/Termin hinzugefügt"
 
-#: compensation/views/compensation_views.py:364
+#: compensation/views/compensation_views.py:363
 msgid "State removed"
 msgstr "Zustand gelöscht"
 
-#: compensation/views/compensation_views.py:383
+#: compensation/views/compensation_views.py:382
 msgid "Action removed"
 msgstr "Maßnahme entfernt"
 
@@ -816,29 +816,29 @@ msgstr "Maßnahme entfernt"
 msgid "Eco-Account {} added"
 msgstr "Ökokonto {} hinzugefügt"
 
-#: compensation/views/eco_account_views.py:142
+#: compensation/views/eco_account_views.py:141
 msgid "Eco-Account {} edited"
 msgstr "Ökokonto {} bearbeitet"
 
-#: compensation/views/eco_account_views.py:228
+#: compensation/views/eco_account_views.py:227
 msgid "Eco-account removed"
 msgstr "Ökokonto entfernt"
 
-#: compensation/views/eco_account_views.py:255
+#: compensation/views/eco_account_views.py:254
 msgid "Deduction removed"
 msgstr "Abbuchung entfernt"
 
-#: compensation/views/eco_account_views.py:298 ema/views.py:171
-#: intervention/views.py:468
+#: compensation/views/eco_account_views.py:297 ema/views.py:248
+#: intervention/views.py:467
 msgid "{} unrecorded"
 msgstr "{} entzeichnet"
 
-#: compensation/views/eco_account_views.py:298 ema/views.py:171
-#: intervention/views.py:468
+#: compensation/views/eco_account_views.py:297 ema/views.py:248
+#: intervention/views.py:467
 msgid "{} recorded"
 msgstr "{} verzeichnet"
 
-#: compensation/views/eco_account_views.py:434 intervention/views.py:450
+#: compensation/views/eco_account_views.py:433 intervention/views.py:449
 msgid "Deduction added"
 msgstr "Abbuchung hinzugefügt"
 
@@ -850,6 +850,14 @@ msgstr "Zahlung hinzugefügt"
 msgid "Payment removed"
 msgstr "Zahlung gelöscht"
 
+#: ema/forms.py:38
+msgid "New EMA"
+msgstr "Neue EMA hinzufügen"
+
+#: ema/forms.py:99
+msgid "Edit EMA"
+msgstr "Bearbeite EMA"
+
 #: ema/tables.py:59 templates/navbar.html:43
 msgid "Payment funded compensations"
 msgstr "Ersatzzahlungsmaßnahmen (EMA)"
@@ -870,7 +878,15 @@ msgstr ""
 msgid "Payment funded compensation"
 msgstr "Ersatzzahlungsmaßnahme"
 
-#: ema/views.py:154
+#: ema/views.py:77
+msgid "EMA {} added"
+msgstr "EMA {} hinzugefügt"
+
+#: ema/views.py:201
+msgid "EMA {} edited"
+msgstr "EMA {} bearbeitet"
+
+#: ema/views.py:231
 msgid "EMA removed"
 msgstr "EMA entfernt"
 
@@ -1144,11 +1160,11 @@ msgstr "vorhanden"
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"
 
-#: intervention/views.py:212
+#: intervention/views.py:211
 msgid "This intervention has a revocation from {}"
 msgstr "Es existiert ein Widerspruch vom {}"
 
-#: intervention/views.py:228
+#: intervention/views.py:227
 msgid ""
 "Remember: This data has not been shared with you, yet. This means you can "
 "only read but can not edit or perform any actions like running a check or "
@@ -1158,43 +1174,43 @@ msgstr ""
 "bedeutet, dass Sie nur lesenden Zugriff hierauf haben und weder bearbeiten, "
 "noch Prüfungen durchführen oder verzeichnen können."
 
-#: intervention/views.py:255
+#: intervention/views.py:254
 msgid "Intervention {} edited"
 msgstr "Eingriff {} bearbeitet"
 
-#: intervention/views.py:287
+#: intervention/views.py:286
 msgid "{} removed"
 msgstr "{} entfernt"
 
-#: intervention/views.py:308
+#: intervention/views.py:307
 msgid "Revocation removed"
 msgstr "Widerspruch entfernt"
 
-#: intervention/views.py:334
+#: intervention/views.py:333
 msgid "{} has already been shared with you"
 msgstr "{} wurde bereits für Sie freigegeben"
 
-#: intervention/views.py:339
+#: intervention/views.py:338
 msgid "{} has been shared with you"
 msgstr "{} ist nun für Sie freigegeben"
 
-#: intervention/views.py:346
+#: intervention/views.py:345
 msgid "Share link invalid"
 msgstr "Freigabelink ungültig"
 
-#: intervention/views.py:367
+#: intervention/views.py:366
 msgid "Share settings updated"
 msgstr "Freigabe Einstellungen aktualisiert"
 
-#: intervention/views.py:386
+#: intervention/views.py:385
 msgid "Check performed"
 msgstr "Prüfung durchgeführt"
 
-#: intervention/views.py:406
+#: intervention/views.py:405
 msgid "Revocation added"
 msgstr "Widerspruch hinzugefügt"
 
-#: intervention/views.py:473
+#: intervention/views.py:472
 msgid "There are errors on this intervention:"
 msgstr "Es liegen Fehler in diesem Eingriff vor:"
 
@@ -1317,18 +1333,6 @@ msgstr "Kontrolle am"
 msgid "Other"
 msgstr "Sonstige"
 
-#: konova/templates/konova/widgets/generate-content-input.html:6
-msgid "Generate new"
-msgstr "Neu generieren"
-
-#: konova/templates/konova/widgets/text-to-clipboard-input.html:6
-msgid "Copy to clipboard"
-msgstr "In Zwischenablage kopieren"
-
-#: konova/templates/konova/widgets/text-to-clipboard-input.html:16
-msgid "Copied to clipboard"
-msgstr "In Zwischenablage kopiert"
-
 #: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61
 #: konova/templates/konova/home.html:100
 msgid "Total"
@@ -1353,6 +1357,18 @@ msgstr "Anzeigen"
 msgid "Deduct"
 msgstr "Abbuchen"
 
+#: konova/templates/konova/widgets/generate-content-input.html:6
+msgid "Generate new"
+msgstr "Neu generieren"
+
+#: konova/templates/konova/widgets/text-to-clipboard-input.html:6
+msgid "Copy to clipboard"
+msgstr "In Zwischenablage kopieren"
+
+#: konova/templates/konova/widgets/text-to-clipboard-input.html:16
+msgid "Copied to clipboard"
+msgstr "In Zwischenablage kopiert"
+
 #: konova/utils/documents.py:52
 msgid "Document '{}' deleted"
 msgstr "Dokument '{}' gelöscht"
@@ -1437,20 +1453,6 @@ msgstr ""
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/form/table/generic_table_form.html:23
-#: templates/form/collapsable/form.html:58
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: templates/form/table/generic_table_form.html:27
-#: templates/form/collapsable/form.html:62
-msgid "Save"
-msgstr "Speichern"
-
-#: templates/form/table/generic_table_form_body.html:24
-msgid "Fields with * are required."
-msgstr "* sind Pflichtfelder."
-
 #: templates/form/collapsable/form.html:14
 msgid ""
 "\n"
@@ -1476,6 +1478,20 @@ msgstr "Mit einem Linksklick öffnen Sie den jeweiligen Formularbereich."
 msgid "General data"
 msgstr "Allgemeine Daten"
 
+#: templates/form/collapsable/form.html:58
+#: templates/form/table/generic_table_form.html:23
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: templates/form/collapsable/form.html:62
+#: templates/form/table/generic_table_form.html:27
+msgid "Save"
+msgstr "Speichern"
+
+#: templates/form/table/generic_table_form_body.html:24
+msgid "Fields with * are required."
+msgstr "* sind Pflichtfelder."
+
 #: templates/generic_index.html:28
 msgid "New entry"
 msgstr "Neuer Eintrag"
@@ -2838,9 +2854,6 @@ msgstr ""
 #~ msgid "Invalid input"
 #~ msgstr "Eingabe fehlerhaft"
 
-#~ msgid "{} edited"
-#~ msgstr "{} bearbeitet"
-
 #~ msgid "Map"
 #~ msgstr "Karte"
 
@@ -2913,12 +2926,6 @@ msgstr ""
 #~ msgid "Add new eco account"
 #~ msgstr "Neues Ökokonto hinzufügen"
 
-#~ msgid "Add new EMA"
-#~ msgstr "Neue EMA hinzufügen"
-
-#~ msgid "Edit EMA"
-#~ msgstr "Bearbeite EMA"
-
 #~ msgid "Delete EMA"
 #~ msgstr "Lösche EMA"