diff --git a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedFragment.kt b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedFragment.kt
index 2adf0e9..899dc0f 100644
--- a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedFragment.kt
+++ b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterDetailedFragment.kt
@@ -19,7 +19,6 @@ import app.nexd.android.ui.auth.register.RegisterDetailedViewModel.Progress.*
 import app.nexd.android.ui.common.Constants
 import app.nexd.android.ui.common.DefaultSnackbar
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.fragment_register_detailed.*
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -57,7 +56,6 @@ class RegisterDetailedFragment : Fragment() {
         }
 
         binding.buttonRegister.setOnClickListener {
-            switchUiIsEnabled(false)
             vm.setUserDetails()
         }
 
@@ -72,13 +70,12 @@ class RegisterDetailedFragment : Fragment() {
                         DefaultSnackbar(view, it, Snackbar.LENGTH_SHORT)
                     }
                     binding.progressBar.visibility = View.GONE
-                    switchUiIsEnabled(true)
+
                 }
                 is Finished -> {
                     activityVm.setUserAsComplete()
                     findNavController().navigateUp()
                     binding.progressBar.visibility = View.GONE
-                    switchUiIsEnabled(true)
                 }
             }
         })
@@ -97,15 +94,4 @@ class RegisterDetailedFragment : Fragment() {
         )
     }
 
-    // TODO: migrate that to ViewModel and bind visibility
-    private fun switchUiIsEnabled(enable: Boolean) {
-        binding.apply {
-            editTextPhoneNumber.isEnabled = enable
-            editTextStreet.isEnabled = enable
-            editTextHouseNr.isEnabled = enable
-            editTextZipCode.isEnabled = enable
-            editTextCity.isEnabled = enable
-            buttonRegister.isEnabled = enable
-        }
-    }
 }
\ No newline at end of file
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..6c7c822 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
@@ -25,28 +25,33 @@ class RegisterDetailedViewModel(
     }
 
     val phoneNumber = MutableLiveData("")
-
     val phoneNumberError = MutableLiveData(0)
+    val phoneNumberIsEnabled = MutableLiveData(true)
 
     val street = MutableLiveData("")
-
     val streetError = MutableLiveData(0)
+    val streetIsEnabled = MutableLiveData(true)
 
     val houseNumber = MutableLiveData("")
-
     val houseNumberError = MutableLiveData(0)
+    val houseNumberIsEnabled = MutableLiveData(true)
 
     val zipCode = MutableLiveData("")
-
     val zipCodeError = MutableLiveData(0)
+    val zipCodeIsEnabled = MutableLiveData(true)
 
     val locality = MutableLiveData("")
-
     val localityError = MutableLiveData(0)
+    val localityIsEnabled = MutableLiveData(true)
+
+    val buttonRegisterIsEnabled = MutableLiveData(true)
+    val buttonDataProtectionIsEnabled = MutableLiveData(true)
 
     val progress = MutableLiveData<Progress>(Progress.Idle)
 
     fun setUserDetails() {
+        switchUiIsEnabled(false)
+
         var success = true
 
         if (phoneNumber.value.isNullOrEmpty()) {
@@ -93,13 +98,16 @@ class RegisterDetailedViewModel(
                 )
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe({
+                        switchUiIsEnabled(true)
                         progress.value = Progress.Finished
                     }, { error ->
+                        switchUiIsEnabled(true)
                         if (error is BackendError) {
                             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(
@@ -121,8 +129,19 @@ class RegisterDetailedViewModel(
                     })
             }
         } else {
+            switchUiIsEnabled(true)
             progress.value = Progress.Error()
         }
     }
 
+    private fun switchUiIsEnabled(enable: Boolean) {
+        phoneNumberIsEnabled.value = enable
+        streetIsEnabled.value = enable
+        houseNumberIsEnabled.value = enable
+        zipCodeIsEnabled.value = enable
+        localityIsEnabled.value = enable
+        buttonRegisterIsEnabled.value = enable
+        buttonDataProtectionIsEnabled.value = enable
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterFragment.kt b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterFragment.kt
index 6103ce4..8c3a30f 100644
--- a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterFragment.kt
+++ b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterFragment.kt
@@ -18,7 +18,6 @@ import app.nexd.android.ui.auth.register.RegisterViewModel.Progress.*
 import app.nexd.android.ui.common.Constants
 import app.nexd.android.ui.common.DefaultSnackbar
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.fragment_register.*
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -58,7 +57,6 @@ class RegisterFragment : Fragment() {
         )
 
         binding.buttonRegister.setOnClickListener {
-            switchUiIsEnabled(false)
             vm.register()
         }
 
@@ -76,12 +74,10 @@ class RegisterFragment : Fragment() {
                     progress.message?.let { message ->
                         DefaultSnackbar(view, message, Snackbar.LENGTH_SHORT)
                     }
-                    switchUiIsEnabled(true)
                 }
                 is Finished -> {
                     activityVm.authenticate(progress.token)
                     findNavController().navigate(RegisterFragmentDirections.toRegisterDetailedFragment())
-                    switchUiIsEnabled(true)
                 }
             }
         })
@@ -100,17 +96,6 @@ class RegisterFragment : Fragment() {
         )
     }
 
-    private fun switchUiIsEnabled(enable: Boolean) {
-        binding.apply {
-            buttonRegister.isEnabled = enable
-            editTextFirstName.isEnabled = enable
-            editTextLastName.isEnabled = enable
-            editTextEmail.isEnabled = enable
-            editTextPassword.isEnabled = enable
-            editTextPasswordConfirm.isEnabled = enable
-            checkboxDataProtection.isEnabled = enable
-        }
 
-    }
 
 }
diff --git a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt
index b484c9f..4a2756c 100644
--- a/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt
+++ b/app/src/main/java/app/nexd/android/ui/auth/register/RegisterViewModel.kt
@@ -26,28 +26,31 @@ class RegisterViewModel(
     }
 
     val firstName = MutableLiveData("")
-
     val firstNameError = MutableLiveData(0)
+    val firstNameIsEnabled = MutableLiveData(true)
 
     val lastName = MutableLiveData("")
-
     val lastNameError = MutableLiveData(0)
+    val lastNameIsEnabled = MutableLiveData(true)
 
     val email = MutableLiveData("")
-
     val emailError = MutableLiveData(0)
+    val emailIsEnabled = MutableLiveData(true)
 
     val password = MutableLiveData("")
-
     val passwordError = MutableLiveData(0)
+    val passwordIsEnabled = MutableLiveData(true)
 
     val passwordConfirmation = MutableLiveData("")
-
     val passwordConfirmationError = MutableLiveData(0)
+    val passwordConfirmationIsEnabled = MutableLiveData(true)
 
     val dataProtection = MutableLiveData(false)
-
     val dataProtectionError = MutableLiveData(0)
+    val dataProtectionIsEnabled = MutableLiveData(true)
+
+    val buttonRegisterIsEnabled = MutableLiveData(true)
+    val buttonDataProtectionIsEnabled = MutableLiveData(true)
 
     val progress = MutableLiveData<Progress>(Progress.Idle)
 
@@ -60,6 +63,7 @@ class RegisterViewModel(
     }
 
     fun register() {
+        switchUiIsEnabled(false)
         var success = true
 
         if (firstName.value.isNullOrEmpty()) {
@@ -111,14 +115,17 @@ class RegisterViewModel(
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(
                         {
+                            switchUiIsEnabled(true)
                             progress.value = Progress.Finished(token = it.accessToken)
                         },
                         {
+                            switchUiIsEnabled(true)
                             handleErrors(it)
                         }
                     )
             }
         } else {
+            switchUiIsEnabled(true)
             progress.value = Progress.Error()
         }
     }
@@ -159,4 +166,15 @@ class RegisterViewModel(
         }
     }
 
+    private fun switchUiIsEnabled(enable: Boolean) {
+        firstNameIsEnabled.value = enable
+        lastNameIsEnabled.value = enable
+        emailIsEnabled.value = enable
+        passwordIsEnabled.value = enable
+        passwordConfirmationIsEnabled.value = enable
+        dataProtectionIsEnabled.value = enable
+        buttonRegisterIsEnabled.value = enable
+        buttonDataProtectionIsEnabled.value = enable
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index d591d21..6418975 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -22,8 +22,8 @@
             android:clickable="true"
             android:focusable="true"
             android:theme="@style/ToolbarThemeWhite"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:navigationIcon="?attr/homeAsUpIndicator" />
 
         <ScrollView
@@ -39,134 +39,140 @@
 
                 <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:id="@+id/imageView"
-                        android:layout_marginTop="92dp"
                         android:layout_width="match_parent"
                         android:layout_height="148dp"
                         android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="92dp"
                         android:src="@drawable/nexd_logo_rgb"
                         tools:ignore="ContentDescription" />
 
                     <Space
-                        android:layout_weight="1"
                         android:layout_width="match_parent"
-                        android:layout_height="0dp" />
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
 
                     <EditText
                         android:id="@+id/editText_first_name"
+                        style="@style/AuthenticationEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:autofillHints="personGivenName"
+                        android:drawableEnd="@drawable/ic_person"
+                        android:enabled="@{viewModel.firstNameIsEnabled}"
                         android:error="@{viewModel.firstNameError}"
-                        style="@style/AuthenticationEditText"
                         android:hint="@string/registration_placeholder_firstName"
                         android:imeOptions="actionNext"
                         android:inputType="textCapWords"
                         android:lines="1"
                         android:nextFocusDown="@id/editText_last_name"
                         android:paddingHorizontal="10dp"
-                        android:text="@={viewModel.firstName}"
-                        android:drawableEnd="@drawable/ic_person"/>
+                        android:text="@={viewModel.firstName}" />
 
                     <EditText
                         android:id="@+id/editText_last_name"
+                        style="@style/AuthenticationEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:autofillHints="personFamilyName"
+                        android:drawableEnd="@drawable/ic_person"
+                        android:enabled="@{viewModel.lastNameIsEnabled}"
                         android:error="@{viewModel.lastNameError}"
-                        style="@style/AuthenticationEditText"
                         android:hint="@string/registration_placeholder_lastName"
                         android:imeOptions="actionNext"
                         android:inputType="textCapWords"
                         android:lines="1"
                         android:nextFocusDown="@id/editText_email"
                         android:paddingHorizontal="10dp"
-                        android:text="@={viewModel.lastName}"
-                        android:drawableEnd="@drawable/ic_person"/>
+                        android:text="@={viewModel.lastName}" />
 
                     <EditText
                         android:id="@+id/editText_email"
+                        style="@style/AuthenticationEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:autofillHints="emailAddress"
+                        android:drawableEnd="@drawable/ic_email"
+                        android:enabled="@{viewModel.emailIsEnabled}"
                         android:error="@{viewModel.emailError}"
-                        style="@style/AuthenticationEditText"
                         android:hint="@string/registration_placeholder_email"
                         android:imeOptions="actionNext"
                         android:inputType="textEmailAddress"
                         android:lines="1"
                         android:nextFocusDown="@id/editText_password"
                         android:paddingHorizontal="10dp"
-                        android:text="@={viewModel.email}"
-                        android:drawableEnd="@drawable/ic_email"/>
+                        android:text="@={viewModel.email}" />
 
                     <EditText
                         android:id="@+id/editText_password"
+                        style="@style/AuthenticationEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
                         android:autofillHints="newPassword"
+                        android:drawableEnd="@drawable/ic_lock"
+                        android:enabled="@{viewModel.passwordIsEnabled}"
                         android:error="@{viewModel.passwordError}"
-                        style="@style/AuthenticationEditText"
                         android:hint="@string/registration_placeholder_password"
                         android:imeOptions="actionNext"
                         android:inputType="textPassword"
                         android:lines="1"
                         android:nextFocusDown="@id/editText_password_confirm"
                         android:paddingHorizontal="10dp"
-                        android:text="@={viewModel.password}"
-                        android:drawableEnd="@drawable/ic_lock"/>
+                        android:text="@={viewModel.password}" />
 
                     <EditText
                         android:id="@+id/editText_password_confirm"
+                        style="@style/AuthenticationEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:autofillHints="newPassword"
+                        android:drawableEnd="@drawable/ic_lock"
+                        android:enabled="@{viewModel.passwordConfirmationIsEnabled}"
                         android:error="@{viewModel.passwordConfirmationError}"
-                        style="@style/AuthenticationEditText"
                         android:hint="@string/registration_placeholder_confirm_password"
                         android:imeOptions="actionDone"
                         android:inputType="textPassword"
                         android:lines="1"
                         android:paddingHorizontal="10dp"
-                        android:text="@={viewModel.passwordConfirmation}"
-                        android:drawableEnd="@drawable/ic_lock"/>
+                        android:text="@={viewModel.passwordConfirmation}" />
 
-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
+                    <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
 
-                <CheckBox
-                    android:id="@+id/checkbox_data_protection"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:buttonTint="@color/colorPrimary"
-                    android:checked="@={viewModel.dataProtection}"
-                    android:error="@{viewModel.dataProtectionError}"
-                    tools:checked="true"
-                    tools:text="@string/registration_label_privacy_policy_agreement" />
+                    <CheckBox
+                        android:id="@+id/checkbox_data_protection"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:buttonTint="@color/colorPrimary"
+                        android:checked="@={viewModel.dataProtection}"
+                        android:enabled="@{viewModel.dataProtectionIsEnabled}"
+                        android:error="@{viewModel.dataProtectionError}"
+                        tools:checked="true"
+                        tools:text="@string/registration_label_privacy_policy_agreement" />
 
                     <Button
                         android:id="@+id/button_register"
@@ -176,6 +182,7 @@
                         android:background="@drawable/rounded_primary"
                         android:drawableEnd="@drawable/ic_chevron_right_black_24dp"
                         android:drawableTint="@android:color/white"
+                        android:enabled="@{viewModel.buttonRegisterIsEnabled}"
                         android:padding="20dp"
                         android:text="@string/registration_button_title_continue"
                         android:textAlignment="textStart"
@@ -192,6 +199,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_margin="10dp"
+                        android:enabled="@{viewModel.buttonDataProtectionIsEnabled}"
                         android:minHeight="0dp"
                         android:text="@string/registration_term_privacy_policy"
                         android:textAllCaps="false" />
diff --git a/app/src/main/res/layout/fragment_register_detailed.xml b/app/src/main/res/layout/fragment_register_detailed.xml
index 40e90cd..a161403 100644
--- a/app/src/main/res/layout/fragment_register_detailed.xml
+++ b/app/src/main/res/layout/fragment_register_detailed.xml
@@ -74,6 +74,7 @@
                         android:lines="1"
                         android:text="@={viewModel.phoneNumber}"
                         android:error="@{viewModel.phoneNumberError}"
+                        android:enabled="@{viewModel.phoneNumberIsEnabled}"
                         style="@style/AuthenticationEditText"
                         android:nextFocusDown="@id/editText_street"
                         android:paddingHorizontal="10dp"
@@ -97,6 +98,7 @@
                             android:lines="1"
                             android:text="@={viewModel.street}"
                             android:error="@{viewModel.streetError}"
+                            android:enabled="@{viewModel.streetIsEnabled}"
                             style="@style/AuthenticationEditText"
                             android:nextFocusRight="@id/editText_houseNr"
                             android:paddingHorizontal="10dp"
@@ -115,6 +117,7 @@
                             android:lines="1"
                             android:text="@={viewModel.houseNumber}"
                             android:error="@{viewModel.houseNumberError}"
+                            android:enabled="@{viewModel.houseNumberIsEnabled}"
                             style="@style/AuthenticationEditText"
                             android:nextFocusDown="@id/editText_zipCode"
                             android:paddingHorizontal="10dp"
@@ -140,6 +143,7 @@
                             android:lines="1"
                             android:text="@={viewModel.zipCode}"
                             android:error="@{viewModel.zipCodeError}"
+                            android:enabled="@{viewModel.zipCodeIsEnabled}"
                             style="@style/AuthenticationEditText"
                             android:nextFocusRight="@id/editText_city"
                             android:paddingHorizontal="10dp"
@@ -158,6 +162,7 @@
                             android:lines="1"
                             android:text="@={viewModel.locality}"
                             android:error="@{viewModel.localityError}"
+                            android:enabled="@{viewModel.localityIsEnabled}"
                             style="@style/AuthenticationEditText"
                             android:paddingHorizontal="10dp"
                              />
@@ -173,6 +178,7 @@
                         android:drawableEnd="@drawable/ic_chevron_right_black_24dp"
                         android:drawableTint="@android:color/white"
                         android:padding="20dp"
+                        android:enabled="@{viewModel.buttonRegisterIsEnabled}"
                         android:text="@string/registration_button_title_send"
                         android:textAlignment="textStart"
                         android:textAllCaps="false"
@@ -188,6 +194,7 @@
                         android:layout_gravity="center_horizontal"
                         android:layout_margin="10dp"
                         android:minHeight="0dp"
+                        android:enabled="@{viewModel.buttonDataProtectionIsEnabled}"
                         android:text="@string/registration_button_privacy_policy"
                         android:textAllCaps="false" />
 
diff --git a/app/src/main/res/layout/fragment_transcript_info.xml b/app/src/main/res/layout/fragment_transcript_info.xml
index e9fce1b..4084895 100644
--- a/app/src/main/res/layout/fragment_transcript_info.xml
+++ b/app/src/main/res/layout/fragment_transcript_info.xml
@@ -192,7 +192,7 @@
                 android:autofillHints="postal-code"
                 android:background="@drawable/rounded_white"
                 android:error="@{viewModel.zipCodeError}"
-                android:inputType="number"
+                android:inputType="textPostalAddress"
                 android:nextFocusDown="@id/editText_city_value"
                 android:padding="10dp"
                 android:text="@={viewModel.zipCode}"