diff --git a/app/build.gradle b/app/build.gradle
index 4b52352..96e23db 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -120,6 +120,8 @@ dependencies {
     implementation 'com.google.android.exoplayer:exoplayer-core:2.11.4'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.4'
 
+    implementation 'com.hbb20:ccp:2.4.0'
+
     // Koin for Android
     implementation "org.koin:koin-android:$koin_version"
     // Koin AndroidX Scope features
diff --git a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedViewModel.kt b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedViewModel.kt
index ce88b45..d443445 100644
--- a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedViewModel.kt
+++ b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedViewModel.kt
@@ -2,6 +2,7 @@ package app.nexd.android.ui.auth.register
 
 import android.util.Log
 import androidx.annotation.StringRes
+import androidx.databinding.BindingAdapter
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import app.nexd.android.Api
@@ -10,6 +11,7 @@ import app.nexd.android.R
 import app.nexd.android.api.model.BackendErrorEntry.ErrorCodeEnum.VALIDATION_PHONENUMBER_INVALID
 import app.nexd.android.api.model.UpdateUserDto
 import app.nexd.android.network.BackendError
+import com.hbb20.CountryCodePicker
 import io.reactivex.android.schedulers.AndroidSchedulers
 
 class RegisterDetailedViewModel(
@@ -24,6 +26,8 @@ class RegisterDetailedViewModel(
         object Finished : Progress()
     }
 
+    val countryCode = MutableLiveData("")
+
     val phoneNumber = MutableLiveData("")
 
     val phoneNumberError = MutableLiveData(0)
@@ -85,7 +89,7 @@ class RegisterDetailedViewModel(
             with(api) {
                 userControllerUpdateMyself(
                     UpdateUserDto()
-                        .phoneNumber(phoneNumber.value)
+                        .phoneNumber("" + countryCode.value + phoneNumber.value!!.substring(1))
                         .street(street.value)
                         .number(houseNumber.value)
                         .zipCode(zipCode.value)
@@ -99,7 +103,8 @@ class RegisterDetailedViewModel(
                             error.errorCodes.forEach {
                                 when (it) {
                                     VALIDATION_PHONENUMBER_INVALID -> {
-                                        phoneNumberError.value = R.string.error_message_input_validation_phone_number_invalid
+                                        phoneNumberError.value =
+                                            R.string.error_message_input_validation_phone_number_invalid
                                     }
                                     else -> {
                                         Log.e(
@@ -125,4 +130,13 @@ class RegisterDetailedViewModel(
         }
     }
 
+    object CountryPickerBindings {
+        @JvmStatic
+        @BindingAdapter("selectedCountry")
+        fun selectedCountry(ccp: CountryCodePicker, result: MutableLiveData<String>) {
+            with(ccp.selectedCountryCodeWithPlus) {
+                result.postValue(this)
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register_detailed.xml b/app/src/main/res/layout/fragment_register_detailed.xml
index 40e90cd..b02dc99 100644
--- a/app/src/main/res/layout/fragment_register_detailed.xml
+++ b/app/src/main/res/layout/fragment_register_detailed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -19,14 +19,14 @@
             android:id="@+id/register_detailed_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:navigationIcon="?attr/homeAsUpIndicator" />
 
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/register_detailed_toolbar" >
+            app:layout_constraintTop_toBottomOf="@id/register_detailed_toolbar">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -35,49 +35,72 @@
 
                 <ProgressBar
                     android:id="@+id/progressBar"
-                    android:layout_alignParentTop="true"
-                    android:visibility="gone"
                     style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginTop="-6dp"
+                    android:layout_marginBottom="-8dp"
                     android:indeterminate="true"
+                    android:indeterminateTint="@color/colorPrimaryDark"
                     android:max="100"
                     android:padding="0dp"
-                    android:layout_marginTop="-6dp"
-                    android:layout_marginBottom="-8dp"
-                    android:indeterminateTint="@color/colorPrimaryDark" />
+                    android:visibility="gone" />
 
                 <LinearLayout
-                    android:paddingHorizontal="20dp"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:paddingHorizontal="20dp">
 
                     <ImageView
                         android:layout_width="match_parent"
-                        android:layout_marginTop="92dp"
                         android:layout_height="148dp"
                         android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="92dp"
                         android:src="@drawable/nexd_logo_rgb"
                         tools:ignore="ContentDescription" />
 
-                    <EditText
-                        android:id="@+id/editText_phoneNumber"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginBottom="20dp"
-                        android:autofillHints="phoneNumber"
-                        android:hint="@string/user_input_details_placeholder_phoneNumber"
-                        android:imeOptions="actionNext"
-                        android:inputType="phone"
-                        android:lines="1"
-                        android:text="@={viewModel.phoneNumber}"
-                        android:error="@{viewModel.phoneNumberError}"
-                        style="@style/AuthenticationEditText"
-                        android:nextFocusDown="@id/editText_street"
-                        android:paddingHorizontal="10dp"
-                        android:drawableEnd="@drawable/ic_telephone_num"/>
+                        android:orientation="horizontal">
+
+                        <com.hbb20.CountryCodePicker
+                            android:id="@+id/ccp_countryCode"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="3"
+                            app:ccp_autoDetectCountry="true"
+                            app:ccp_autoDetectLanguage="true"
+                            app:ccp_countryPreference="DE,AT,CH"
+                            app:ccp_showFlag="true"
+                            app:ccp_showFullName="false"
+                            app:ccp_showNameCode="false"
+                            app:ccp_showPhoneCode="true"
+                            app:ccp_textGravity="LEFT"
+                            app:selectedCountry="@{viewModel.countryCode}" />
+
+                        <EditText
+                            android:id="@+id/editText_phoneNumber"
+                            style="@style/AuthenticationEditText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="10dp"
+                            android:layout_marginBottom="20dp"
+                            android:layout_weight="2"
+                            android:autofillHints="phoneNumber"
+                            android:drawableEnd="@drawable/ic_telephone_num"
+                            android:error="@{viewModel.phoneNumberError}"
+                            android:hint="@string/user_input_details_placeholder_phoneNumber"
+                            android:imeOptions="actionNext"
+                            android:inputType="phone"
+                            android:lines="1"
+                            android:nextFocusDown="@id/editText_street"
+                            android:paddingHorizontal="10dp"
+                            android:text="@={viewModel.phoneNumber}" />
+                    </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -86,39 +109,37 @@
 
                         <EditText
                             android:id="@+id/editText_street"
+                            style="@style/AuthenticationEditText"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_weight="4"
                             android:autofillHints="streetAddress"
+                            android:error="@{viewModel.streetError}"
                             android:hint="@string/user_input_details_placeholder_street"
                             android:imeOptions="actionNext"
                             android:inputType="textCapWords"
                             android:lines="1"
-                            android:text="@={viewModel.street}"
-                            android:error="@{viewModel.streetError}"
-                            style="@style/AuthenticationEditText"
                             android:nextFocusRight="@id/editText_houseNr"
                             android:paddingHorizontal="10dp"
-                            />
+                            android:text="@={viewModel.street}" />
 
                         <EditText
                             android:id="@+id/editText_houseNr"
+                            style="@style/AuthenticationEditText"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_weight="1"
                             android:autofillHints="houseNumber"
+                            android:error="@{viewModel.houseNumberError}"
                             android:hint="@string/user_input_details_placeholder_houseNumber"
                             android:imeOptions="actionNext"
                             android:inputType="text"
                             android:lines="1"
-                            android:text="@={viewModel.houseNumber}"
-                            android:error="@{viewModel.houseNumberError}"
-                            style="@style/AuthenticationEditText"
                             android:nextFocusDown="@id/editText_zipCode"
                             android:paddingHorizontal="10dp"
-                            />
+                            android:text="@={viewModel.houseNumber}" />
 
                     </LinearLayout>
 
@@ -129,38 +150,36 @@
 
                         <EditText
                             android:id="@+id/editText_zipCode"
+                            style="@style/AuthenticationEditText"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_weight="1"
                             android:autofillHints="postalCode"
+                            android:error="@{viewModel.zipCodeError}"
                             android:hint="@string/user_input_details_placeholder_zipCode"
                             android:imeOptions="actionNext"
                             android:inputType="textPostalAddress"
                             android:lines="1"
-                            android:text="@={viewModel.zipCode}"
-                            android:error="@{viewModel.zipCodeError}"
-                            style="@style/AuthenticationEditText"
                             android:nextFocusRight="@id/editText_city"
                             android:paddingHorizontal="10dp"
-                            />
+                            android:text="@={viewModel.zipCode}" />
 
                         <EditText
                             android:id="@+id/editText_city"
+                            style="@style/AuthenticationEditText"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_weight="3"
                             android:autofillHints="addressLocality"
+                            android:error="@{viewModel.localityError}"
                             android:hint="@string/user_input_details_placeholder_city"
                             android:imeOptions="actionDone"
                             android:inputType="textCapWords"
                             android:lines="1"
-                            android:text="@={viewModel.locality}"
-                            android:error="@{viewModel.localityError}"
-                            style="@style/AuthenticationEditText"
                             android:paddingHorizontal="10dp"
-                             />
+                            android:text="@={viewModel.locality}" />
                     </LinearLayout>
 
                     <Button