diff --git a/aleksis/core/preferences.py b/aleksis/core/preferences.py
index 9aed9b45561c411e86bcb4a09dbd604a78545446..77322db0f5f64d3e79f0756805208fc54cc5e6e8 100644
--- a/aleksis/core/preferences.py
+++ b/aleksis/core/preferences.py
@@ -120,14 +120,12 @@ class ImprintURL(StringPreference):
 class AdressingNameFormat(ChoicePreference):
     section = notification
     name = "addressing_name_format"
-    default = "german"
+    default = "first_last"
     required = False
     verbose_name = _("Name format for addressing")
     choices = (
-        (None, "-----"),
-        ("german", "John Doe"),
-        ("english", "Doe, John"),
-        ("dutch", "Doe John"),
+        ("first_last", "John Doe"),
+        ("last_fist", "Doe, John"),
     )