diff --git a/dav_events/choices.py b/dav_events/choices.py
index 9fe28ce..86c74ea 100644
--- a/dav_events/choices.py
+++ b/dav_events/choices.py
@@ -39,7 +39,7 @@ class ChoiceSet(object):
 
 
 class CountryChoiceSet(Countries):
-    first = ['DE', 'AUT', 'CH', 'FR', 'IT']
+    first = ['DE', 'AT', 'CH', 'FR', 'IT']
     first_repeat = True
     first_break = '--'
 
diff --git a/dav_events/forms/events.py b/dav_events/forms/events.py
index 4d00a75..8276d74 100644
--- a/dav_events/forms/events.py
+++ b/dav_events/forms/events.py
@@ -727,15 +727,15 @@ class ChargesForm(EventCreateForm):
             charge_key = 'C'
         elif terrain != 'alpine':
             charge_key = 'D'
-        elif mode == 'training' and country in ('DE', 'AUT'):
+        elif mode == 'training' and country in ('DE', 'AT'):
             charge_key = 'G'
         elif mode == 'training':
             charge_key = 'H'
-        elif sport == 'K' and country in ('DE', 'AUT'):
+        elif sport == 'K' and country in ('DE', 'AT'):
             charge_key = 'E'
         elif sport == 'K':
             charge_key = 'F'
-        elif country in ('DE', 'AUT'):
+        elif country in ('DE', 'AT'):
             charge_key = 'I'
         else:
             charge_key = 'J'