diff --git a/src/Form/PersonalDataType.php b/src/Form/PersonalDataType.php
index 29138d5..8afd71f 100644
--- a/src/Form/PersonalDataType.php
+++ b/src/Form/PersonalDataType.php
@@ -32,6 +32,11 @@ class PersonalDataType extends AbstractType
                 'label' => 'Land',
                 'property_path' => 'address.country',
             ])
+            ->add('nationality', CountryType::class, [
+                'label' => 'Nationalität',
+                'property' => 'nationality',
+                'preferred_choices' => ['D', 'A', 'CH'],
+            ])
             ->add('email', EmailType::class, [
                 'label' => 'E-Mail',
                 'property_path' => 'communication.email',
diff --git a/templates/account/personal_data.html.twig b/templates/account/personal_data.html.twig
index 4310029..9cb1357 100644
--- a/templates/account/personal_data.html.twig
+++ b/templates/account/personal_data.html.twig
@@ -15,8 +15,6 @@
                     <strong>Gender</strong>: {{ personalData.gender|map_gender }}
                     <br>
                     <strong>Geburtsdatum</strong>: {{ personalData.dateOfBirth|date('d.m.Y') }}
-                    <br>
-                    <strong>Nationalität</strong>: {{ personalData.nationality|map_nationality|default('-') }}
                 </div>
                 <div id="newsletter">
                     <p class="pb-4 text-white">
@@ -47,6 +45,7 @@
                         {{ form_row(personalDataForm.country, { 'label_attr': { 'class': 'text-white' } }) }}
                     </div>
                     <div>
+                        {{ form_row(personalDataForm.nationality, { 'label_attr': { 'class': 'text-white' } }) }}
                         {{ form_row(personalDataForm.email, { 'label_attr': { 'class': 'text-white' } }) }}
                         {{ form_row(personalDataForm.phone, { 'label_attr': { 'class': 'text-white' } }) }}
                         {{ form_row(personalDataForm.mobile, { 'label_attr': { 'class': 'text-white' } }) }}