From c32bac7b0719bd8d5f78b805b67b3209e4969a0a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 15 Jul 2025 16:32:40 +0200
Subject: [PATCH] Added missing operation in progress dialog during account
 REGISTER in assistant

---
 .../assistant_landing_fragment.xml            | 525 ++++++-------
 ...third_party_sip_account_login_fragment.xml | 711 +++++++++---------
 .../res/layout/assistant_landing_fragment.xml | 551 +++++++-------
 ...third_party_sip_account_login_fragment.xml | 653 ++++++++--------
 4 files changed, 1242 insertions(+), 1198 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
index 6a2908e4d..8ddde774f 100644
--- a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
 
     <data>
         <import type="android.view.View" />
@@ -28,283 +29,293 @@
             type="org.linphone.ui.assistant.viewmodel.AccountLoginViewModel" />
     </data>
 
-    <ScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
         android:background="?attr/color_main2_000">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:src="@drawable/assistant_logo"
-                app:layout_constraintStart_toEndOf="@id/title"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/mountains"
-                app:layout_constraintTop_toBottomOf="@id/register" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <ImageView
-                android:id="@+id/back"
-                android:onClick="@{backClickListener}"
-                android:layout_width="@dimen/top_bar_height"
-                android:layout_height="@dimen/top_bar_height"
-                android:layout_marginStart="40dp"
-                android:padding="15dp"
-                android:src="@drawable/caret_left"
-                android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
-                android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintTop_toTopOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/title"/>
-    
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/assistant_page_title_style"
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/top_bar_height"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="@dimen/assistant_title_top_margin"
-                android:text="@string/assistant_account_login"
-                android:textColor="?attr/color_text"
-                android:textSize="28sp"
-                android:drawableStart="@drawable/user_circle"
-                android:drawablePadding="10dp"
-                app:layout_constraintWidth_min="@dimen/button_max_width"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toEndOf="@id/back"/>
+                <ImageView
+                    android:id="@+id/logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    android:src="@drawable/assistant_logo"
+                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/mountains"
+                    app:layout_constraintTop_toBottomOf="@id/register" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/help"
-                android:onClick="@{helpClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:layout_marginEnd="20dp"
-                android:text="@string/help_title"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_500"
-                android:drawableStart="@drawable/question"
-                android:drawablePadding="5dp"
-                app:drawableTint="?attr/color_main2_500"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
+                <ImageView
+                    android:id="@+id/back"
+                    android:onClick="@{backClickListener}"
+                    android:layout_width="@dimen/top_bar_height"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:layout_marginStart="40dp"
+                    android:padding="15dp"
+                    android:src="@drawable/caret_left"
+                    android:contentDescription="@string/content_description_go_back_icon"
+                    android:background="@drawable/circle_transparent_button_background"
+                    android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintTop_toTopOf="@id/title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/no_account_yet"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="20dp"
-                android:text="@string/assistant_no_account_yet"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_700"
-                android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
-                app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintEnd_toStartOf="@id/register"
-                app:layout_constraintTop_toTopOf="@id/register"
-                app:layout_constraintBottom_toBottomOf="@id/register"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/assistant_page_title_style"
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="@dimen/assistant_title_top_margin"
+                    android:text="@string/assistant_account_login"
+                    android:textColor="?attr/color_text"
+                    android:textSize="28sp"
+                    android:drawableStart="@drawable/user_circle"
+                    android:drawablePadding="10dp"
+                    app:layout_constraintWidth_min="@dimen/button_max_width"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/back"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/primary_button_label_style"
-                android:id="@+id/register"
-                android:onClick="@{registerClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="40dp"
-                android:layout_marginEnd="40dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_account_register"
-                android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/help"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/help"
+                    android:onClick="@{helpClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:text="@string/help_title"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_500"
+                    android:drawableStart="@drawable/question"
+                    android:drawablePadding="5dp"
+                    app:drawableTint="?attr/color_main2_500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/sip_identity_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="16dp"
-                android:labelFor="@id/sip_identity"
-                android:text="@{@string/username + `*`, default=`Username*`}"
-                app:layout_constraintVertical_chainStyle="packed"
-                app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="@id/sip_identity"
-                app:layout_constraintBottom_toTopOf="@id/sip_identity"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/no_account_yet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="20dp"
+                    android:text="@string/assistant_no_account_yet"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_700"
+                    android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintEnd_toStartOf="@id/register"
+                    app:layout_constraintTop_toTopOf="@id/register"
+                    app:layout_constraintBottom_toBottomOf="@id/register"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/sip_identity"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.sipIdentity, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textNoSuggestions"
-                android:hint="@string/username"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"
-                app:layout_constraintTop_toBottomOf="@id/sip_identity_label"
-                app:layout_constraintBottom_toTopOf="@id/password_label"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/primary_button_label_style"
+                    android:id="@+id/register"
+                    android:onClick="@{registerClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="40dp"
+                    android:layout_marginEnd="40dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_account_register"
+                    android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/help"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/password_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="16dp"
-                android:labelFor="@id/password"
-                android:text="@{@string/password + `*`, default=`Password*`}"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/sip_identity"
-                app:layout_constraintStart_toStartOf="@id/password"
-                app:layout_constraintBottom_toTopOf="@id/password"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/sip_identity_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:labelFor="@id/sip_identity"
+                    android:text="@{@string/username + `*`, default=`Username*`}"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    app:layout_constraintTop_toBottomOf="@id/title"
+                    app:layout_constraintStart_toStartOf="@id/sip_identity"
+                    app:layout_constraintBottom_toTopOf="@id/sip_identity"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/password"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.password, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:hint="@string/password"
-                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"
-                app:layout_constraintTop_toBottomOf="@id/password_label"
-                app:layout_constraintBottom_toTopOf="@id/login"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/sip_identity"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.sipIdentity, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textNoSuggestions"
+                    android:hint="@string/username"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"
+                    app:layout_constraintTop_toBottomOf="@id/sip_identity_label"
+                    app:layout_constraintBottom_toTopOf="@id/password_label"/>
 
-            <ImageView
-                android:id="@+id/eye"
-                android:onClick="@{() -> viewModel.toggleShowPassword()}"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="0dp"
-                android:padding="4dp"
-                android:layout_marginEnd="20dp"
-                android:contentDescription="@string/content_description_toggle_password_visibility"
-                android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintEnd_toEndOf="@id/password"
-                app:layout_constraintTop_toTopOf="@id/password"
-                app:layout_constraintBottom_toBottomOf="@id/password" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/password_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:labelFor="@id/password"
+                    android:text="@{@string/password + `*`, default=`Password*`}"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/sip_identity"
+                    app:layout_constraintStart_toStartOf="@id/password"
+                    app:layout_constraintBottom_toTopOf="@id/password"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/primary_button_label_style"
-                android:id="@+id/login"
-                android:onClick="@{() -> viewModel.login()}"
-                android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_account_login"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintTop_toBottomOf="@id/password"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintBottom_toTopOf="@id/scan_qr_code"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/password"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.password, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:hint="@string/password"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"
+                    app:layout_constraintTop_toBottomOf="@id/password_label"
+                    app:layout_constraintBottom_toTopOf="@id/login"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style_600"
-                android:id="@+id/forgotten_password"
-                android:onClick="@{forgottenPasswordClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:paddingTop="13dp"
-                android:paddingBottom="13dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_forgotten_password"
-                android:textSize="13sp"
-                android:textColor="?attr/color_main2_500"
-                app:layout_constraintStart_toEndOf="@id/login"
-                app:layout_constraintTop_toTopOf="@id/login"
-                app:layout_constraintBottom_toBottomOf="@id/login"/>
+                <ImageView
+                    android:id="@+id/eye"
+                    android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                    android:layout_width="@dimen/icon_size"
+                    android:layout_height="0dp"
+                    android:padding="4dp"
+                    android:layout_marginEnd="20dp"
+                    android:contentDescription="@string/content_description_toggle_password_visibility"
+                    android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintEnd_toEndOf="@id/password"
+                    app:layout_constraintTop_toTopOf="@id/password"
+                    app:layout_constraintBottom_toBottomOf="@id/password" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/secondary_button_label_style"
-                android:id="@+id/scan_qr_code"
-                android:onClick="@{qrCodeClickListener}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_scan_qr_code"
-                android:drawableStart="@drawable/qr_code"
-                android:drawablePadding="8dp"
-                android:visibility="@{viewModel.hideScanQrCode ? View.GONE : View.VISIBLE}"
-                app:drawableTint="@color/secondary_button_label_color"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"
-                app:layout_constraintTop_toBottomOf="@id/login"
-                app:layout_constraintBottom_toTopOf="@id/third_party_sip_account" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/primary_button_label_style"
+                    android:id="@+id/login"
+                    android:onClick="@{() -> viewModel.login()}"
+                    android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_account_login"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/password"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintBottom_toTopOf="@id/scan_qr_code"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/secondary_button_label_style"
-                android:id="@+id/third_party_sip_account"
-                android:onClick="@{thirdPartySipAccountLoginClickListener}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_login_third_party_sip_account"
-                android:visibility="@{viewModel.hideThirdPartyAccount ? View.GONE : View.VISIBLE}"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"
-                app:layout_constraintTop_toBottomOf="@id/scan_qr_code"
-                app:layout_constraintBottom_toTopOf="@id/mountains"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style_600"
+                    android:id="@+id/forgotten_password"
+                    android:onClick="@{forgottenPasswordClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="20dp"
+                    android:paddingTop="13dp"
+                    android:paddingBottom="13dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_forgotten_password"
+                    android:textSize="13sp"
+                    android:textColor="?attr/color_main2_500"
+                    app:layout_constraintStart_toEndOf="@id/login"
+                    app:layout_constraintTop_toTopOf="@id/login"
+                    app:layout_constraintBottom_toBottomOf="@id/login"/>
 
-            <ImageView
-                android:id="@+id/mountains"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:tint="?attr/color_main1_500" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/secondary_button_label_style"
+                    android:id="@+id/scan_qr_code"
+                    android:onClick="@{qrCodeClickListener}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_scan_qr_code"
+                    android:drawableStart="@drawable/qr_code"
+                    android:drawablePadding="8dp"
+                    android:visibility="@{viewModel.hideScanQrCode ? View.GONE : View.VISIBLE}"
+                    app:drawableTint="@color/secondary_button_label_color"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"
+                    app:layout_constraintTop_toBottomOf="@id/login"
+                    app:layout_constraintBottom_toTopOf="@id/third_party_sip_account" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/secondary_button_label_style"
+                    android:id="@+id/third_party_sip_account"
+                    android:onClick="@{thirdPartySipAccountLoginClickListener}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_login_third_party_sip_account"
+                    android:visibility="@{viewModel.hideThirdPartyAccount ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"
+                    app:layout_constraintTop_toBottomOf="@id/scan_qr_code"
+                    app:layout_constraintBottom_toTopOf="@id/mountains"/>
 
-    </ScrollView>
+                <ImageView
+                    android:id="@+id/mountains"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/mountains"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="?attr/color_main1_500" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+
+        <include
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.registrationInProgress}" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
index b9115a91c..705e52297 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
 
     <data>
         <import type="android.view.View" />
@@ -13,384 +14,394 @@
             type="org.linphone.ui.assistant.viewmodel.ThirdPartySipAccountLoginViewModel" />
     </data>
 
-    <ScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
         android:background="?attr/color_main2_000">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:src="@drawable/assistant_logo"
-                app:layout_constraintStart_toEndOf="@id/advanced_settings"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/mountains"
-                app:layout_constraintTop_toBottomOf="@id/title" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <ImageView
-                android:id="@+id/back"
-                android:onClick="@{backClickListener}"
-                android:layout_width="@dimen/top_bar_height"
-                android:layout_height="@dimen/top_bar_height"
-                android:layout_marginStart="40dp"
-                android:padding="15dp"
-                android:src="@drawable/caret_left"
-                android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintTop_toTopOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/title"/>
+                <ImageView
+                    android:id="@+id/logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    android:src="@drawable/assistant_logo"
+                    app:layout_constraintStart_toEndOf="@id/advanced_settings"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/mountains"
+                    app:layout_constraintTop_toBottomOf="@id/title" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/assistant_page_title_style"
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/top_bar_height"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="@dimen/assistant_title_top_margin"
-                android:text="@string/assistant_login_third_party_sip_account_title"
-                android:textColor="?attr/color_text"
-                android:textSize="28sp"
-                android:drawableStart="@drawable/user_circle"
-                android:drawablePadding="10dp"
-                app:layout_constraintWidth_min="@dimen/button_max_width"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toEndOf="@id/back"/>
+                <ImageView
+                    android:id="@+id/back"
+                    android:onClick="@{backClickListener}"
+                    android:layout_width="@dimen/top_bar_height"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:layout_marginStart="40dp"
+                    android:padding="15dp"
+                    android:src="@drawable/caret_left"
+                    android:contentDescription="@string/content_description_go_back_icon"
+                    android:background="@drawable/circle_transparent_button_background"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintTop_toTopOf="@id/title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/username_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="16dp"
-                android:labelFor="@id/username"
-                android:text="@{@string/username + `*`}"
-                app:layout_constraintVertical_chainStyle="packed"
-                app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintBottom_toTopOf="@id/username"
-                app:layout_constraintStart_toStartOf="@id/username"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/assistant_page_title_style"
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="@dimen/assistant_title_top_margin"
+                    android:text="@string/assistant_login_third_party_sip_account_title"
+                    android:textColor="?attr/color_text"
+                    android:textSize="28sp"
+                    android:drawableStart="@drawable/user_circle"
+                    android:drawablePadding="10dp"
+                    app:layout_constraintWidth_min="@dimen/button_max_width"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/back"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/username"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.username, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text"
-                android:hint="@string/username"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintTop_toBottomOf="@id/username_label"
-                app:layout_constraintBottom_toTopOf="@id/password_label"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/username_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:labelFor="@id/username"
+                    android:text="@{@string/username + `*`}"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    app:layout_constraintTop_toBottomOf="@id/title"
+                    app:layout_constraintBottom_toTopOf="@id/username"
+                    app:layout_constraintStart_toStartOf="@id/username"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/password_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="16dp"
-                android:labelFor="@id/password"
-                android:text="@{@string/password + `*`}"
-                app:layout_constraintTop_toBottomOf="@id/username"
-                app:layout_constraintBottom_toTopOf="@id/password"
-                app:layout_constraintStart_toStartOf="@id/password"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/username"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.username, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text"
+                    android:hint="@string/username"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/username_label"
+                    app:layout_constraintBottom_toTopOf="@id/password_label"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/password"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.password, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:hint="@string/password"
-                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/password_label"
-                app:layout_constraintBottom_toTopOf="@id/domain_label"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/password_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:labelFor="@id/password"
+                    android:text="@{@string/password + `*`}"
+                    app:layout_constraintTop_toBottomOf="@id/username"
+                    app:layout_constraintBottom_toTopOf="@id/password"
+                    app:layout_constraintStart_toStartOf="@id/password"/>
 
-            <ImageView
-                android:onClick="@{() -> viewModel.toggleShowPassword()}"
-                android:id="@+id/eye"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="0dp"
-                android:layout_marginEnd="20dp"
-                android:padding="4dp"
-                android:contentDescription="@string/content_description_toggle_password_visibility"
-                android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintEnd_toEndOf="@id/password"
-                app:layout_constraintTop_toTopOf="@id/password"
-                app:layout_constraintBottom_toBottomOf="@id/password" />
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/password"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.password, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:hint="@string/password"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/password_label"
+                    app:layout_constraintBottom_toTopOf="@id/domain_label"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/domain_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/domain"
-                android:text="@{@string/sip_address_domain + `*`, default=`Domain*`}"
-                app:layout_constraintTop_toBottomOf="@id/password"
-                app:layout_constraintBottom_toTopOf="@id/domain"
-                app:layout_constraintStart_toStartOf="@id/domain"/>
+                <ImageView
+                    android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                    android:id="@+id/eye"
+                    android:layout_width="@dimen/icon_size"
+                    android:layout_height="0dp"
+                    android:layout_marginEnd="20dp"
+                    android:padding="4dp"
+                    android:contentDescription="@string/content_description_toggle_password_visibility"
+                    android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintEnd_toEndOf="@id/password"
+                    app:layout_constraintTop_toTopOf="@id/password"
+                    app:layout_constraintBottom_toBottomOf="@id/password" />
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/domain"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.domain, default=`sip.example.net`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textUri"
-                android:hint="@string/sip_address_domain"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/domain_label"
-                app:layout_constraintBottom_toTopOf="@id/display_name_label"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/domain_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/domain"
+                    android:text="@{@string/sip_address_domain + `*`, default=`Domain*`}"
+                    app:layout_constraintTop_toBottomOf="@id/password"
+                    app:layout_constraintBottom_toTopOf="@id/domain"
+                    app:layout_constraintStart_toStartOf="@id/domain"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/display_name_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/display_name"
-                android:text="@string/sip_address_display_name"
-                app:layout_constraintTop_toBottomOf="@id/domain"
-                app:layout_constraintBottom_toTopOf="@id/display_name"
-                app:layout_constraintStart_toStartOf="@id/display_name"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/domain"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.domain, default=`sip.example.net`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textUri"
+                    android:hint="@string/sip_address_domain"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/domain_label"
+                    app:layout_constraintBottom_toTopOf="@id/display_name_label"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/display_name"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.displayName, default=`John Doe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textPersonName|textCapSentences"
-                android:hint="@string/sip_address_display_name"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/display_name_label"
-                app:layout_constraintBottom_toTopOf="@id/transport_label"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/display_name_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/display_name"
+                    android:text="@string/sip_address_display_name"
+                    app:layout_constraintTop_toBottomOf="@id/domain"
+                    app:layout_constraintBottom_toTopOf="@id/display_name"
+                    app:layout_constraintStart_toStartOf="@id/display_name"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/transport_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/transport"
-                android:text="@string/assistant_sip_account_transport_protocol"
-                app:layout_constraintTop_toBottomOf="@id/display_name"
-                app:layout_constraintBottom_toTopOf="@id/transport"
-                app:layout_constraintStart_toStartOf="@id/transport"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/display_name"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.displayName, default=`John Doe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textPersonName|textCapSentences"
+                    android:hint="@string/sip_address_display_name"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/display_name_label"
+                    app:layout_constraintBottom_toTopOf="@id/transport_label"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/transport"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:background="@drawable/edit_text_background"
-                android:overlapAnchor="false"
-                android:spinnerMode="dropdown"
-                android:popupBackground="@drawable/shape_squircle_white_background"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/transport_label"
-                app:layout_constraintBottom_toTopOf="@id/login"
-                app:layout_constraintStart_toStartOf="@id/title"
-                app:layout_constraintEnd_toEndOf="@id/title"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/transport_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/transport"
+                    android:text="@string/assistant_sip_account_transport_protocol"
+                    app:layout_constraintTop_toBottomOf="@id/display_name"
+                    app:layout_constraintBottom_toTopOf="@id/transport"
+                    app:layout_constraintStart_toStartOf="@id/transport"/>
 
-            <ImageView
-                android:id="@+id/transport_caret"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:src="@drawable/caret_down"
-                android:contentDescription="@null"
-                app:tint="?attr/color_main2_600"
-                app:layout_constraintTop_toTopOf="@id/transport"
-                app:layout_constraintBottom_toBottomOf="@id/transport"
-                app:layout_constraintEnd_toEndOf="@id/transport"/>
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/transport"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:background="@drawable/edit_text_background"
+                    android:overlapAnchor="false"
+                    android:spinnerMode="dropdown"
+                    android:popupBackground="@drawable/shape_squircle_white_background"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/transport_label"
+                    app:layout_constraintBottom_toTopOf="@id/login"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/primary_button_label_style"
-                android:onClick="@{() -> viewModel.login()}"
-                android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
-                android:id="@+id/login"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_account_login"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintTop_toBottomOf="@id/transport"
-                app:layout_constraintBottom_toTopOf="@id/mountains"
-                app:layout_constraintStart_toStartOf="@id/title" />
+                <ImageView
+                    android:id="@+id/transport_caret"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="20dp"
+                    android:src="@drawable/caret_down"
+                    android:contentDescription="@null"
+                    app:tint="?attr/color_main2_600"
+                    app:layout_constraintTop_toTopOf="@id/transport"
+                    app:layout_constraintBottom_toBottomOf="@id/transport"
+                    app:layout_constraintEnd_toEndOf="@id/transport"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/section_header_style"
-                android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
-                android:id="@+id/advanced_settings"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginTop="35dp"
-                android:padding="5dp"
-                android:text="@string/settings_advanced_title"
-                android:drawableEnd="@{viewModel.expandAdvancedSettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-                android:drawableTint="?attr/color_main2_600"
-                android:drawablePadding="10dp"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintStart_toEndOf="@id/title"
-                app:layout_constraintEnd_toStartOf="@id/logo"
-                app:layout_constraintTop_toBottomOf="@id/title" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/primary_button_label_style"
+                    android:onClick="@{() -> viewModel.login()}"
+                    android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
+                    android:id="@+id/login"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="@dimen/screen_bottom_margin"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_account_login"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/transport"
+                    app:layout_constraintBottom_toTopOf="@id/mountains"
+                    app:layout_constraintStart_toStartOf="@id/title" />
 
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/advanced_settings_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:constraint_referenced_ids="authentication_id_label, authentication_id, outbound_proxy_label, outbound_proxy"
-                android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/section_header_style"
+                    android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
+                    android:id="@+id/advanced_settings"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginTop="35dp"
+                    android:padding="5dp"
+                    android:text="@string/settings_advanced_title"
+                    android:drawableEnd="@{viewModel.expandAdvancedSettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                    android:drawableTint="?attr/color_main2_600"
+                    android:drawablePadding="10dp"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintEnd_toStartOf="@id/logo"
+                    app:layout_constraintTop_toBottomOf="@id/title" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/authentication_id_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/authentication_id"
-                android:text="@string/authentication_id"
-                app:layout_constraintTop_toBottomOf="@id/advanced_settings"
-                app:layout_constraintStart_toStartOf="@id/authentication_id"/>
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/advanced_settings_group"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:constraint_referenced_ids="authentication_id_label, authentication_id, outbound_proxy_label, outbound_proxy"
+                    android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" />
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/authentication_id"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.authId}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text"
-                android:hint="@string/authentication_id"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/authentication_id_label"
-                app:layout_constraintStart_toStartOf="@id/advanced_settings"
-                app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/authentication_id_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/authentication_id"
+                    android:text="@string/authentication_id"
+                    app:layout_constraintTop_toBottomOf="@id/advanced_settings"
+                    app:layout_constraintStart_toStartOf="@id/authentication_id"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/outbound_proxy_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/outbound_proxy"
-                android:text="@string/account_settings_sip_proxy_url_title"
-                app:layout_constraintTop_toBottomOf="@id/authentication_id"
-                app:layout_constraintStart_toStartOf="@id/outbound_proxy"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/authentication_id"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.authId}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text"
+                    android:hint="@string/authentication_id"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/authentication_id_label"
+                    app:layout_constraintStart_toStartOf="@id/advanced_settings"
+                    app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/outbound_proxy"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.outboundProxy, default=`sip12.example.net`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textUri"
-                android:hint="@string/account_settings_sip_proxy_url_title"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/outbound_proxy_label"
-                app:layout_constraintStart_toStartOf="@id/advanced_settings"
-                app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/outbound_proxy_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/outbound_proxy"
+                    android:text="@string/account_settings_sip_proxy_url_title"
+                    app:layout_constraintTop_toBottomOf="@id/authentication_id"
+                    app:layout_constraintStart_toStartOf="@id/outbound_proxy"/>
 
-            <ImageView
-                android:id="@+id/mountains"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:tint="?attr/color_main1_500" />
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/outbound_proxy"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.outboundProxy, default=`sip12.example.net`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textUri"
+                    android:hint="@string/account_settings_sip_proxy_url_title"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/outbound_proxy_label"
+                    app:layout_constraintStart_toStartOf="@id/advanced_settings"
+                    app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <ImageView
+                    android:id="@+id/mountains"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/mountains"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="?attr/color_main1_500" />
 
-    </ScrollView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+
+        <include
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.registrationInProgress}" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_landing_fragment.xml b/app/src/main/res/layout/assistant_landing_fragment.xml
index 4a17dde1f..edc6853d0 100644
--- a/app/src/main/res/layout/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout/assistant_landing_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
 
     <data>
         <import type="android.view.View" />
@@ -28,298 +29,308 @@
             type="org.linphone.ui.assistant.viewmodel.AccountLoginViewModel" />
     </data>
 
-    <ScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
         android:background="?attr/color_main2_000">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
-            <ImageView
-                style="@style/icon_top_bar_button_style"
-                android:id="@+id/back"
-                android:onClick="@{backClickListener}"
-                android:layout_width="@dimen/top_bar_height"
-                android:layout_height="@dimen/top_bar_height"
-                android:src="@drawable/caret_left"
-                android:contentDescription="@string/content_description_go_back_icon"
-                android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"/>
-    
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/assistant_page_title_style"
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/assistant_account_login"
-                android:textColor="?attr/color_text"
-                app:layout_constraintTop_toTopOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/back"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/help"
-                android:onClick="@{helpClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:text="@string/help_title"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_500"
-                android:drawableStart="@drawable/question"
-                android:drawablePadding="5dp"
-                app:drawableTint="?attr/color_main2_500"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/title"
-                app:layout_constraintBottom_toBottomOf="@id/title"/>
+                <ImageView
+                    style="@style/icon_top_bar_button_style"
+                    android:id="@+id/back"
+                    android:onClick="@{backClickListener}"
+                    android:layout_width="@dimen/top_bar_height"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:src="@drawable/caret_left"
+                    android:contentDescription="@string/content_description_go_back_icon"
+                    android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/sip_identity_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/sip_identity"
-                android:text="@{@string/username + `*`, default=`Username*`}"
-                app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="@id/sip_identity"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/assistant_page_title_style"
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/assistant_account_login"
+                    android:textColor="?attr/color_text"
+                    app:layout_constraintTop_toTopOf="@id/back"
+                    app:layout_constraintBottom_toBottomOf="@id/back"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/sip_identity"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.sipIdentity, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textNoSuggestions"
-                android:hint="@string/username"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/sip_identity_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/help"
+                    android:onClick="@{helpClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="20dp"
+                    android:text="@string/help_title"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_500"
+                    android:drawableStart="@drawable/question"
+                    android:drawablePadding="5dp"
+                    app:drawableTint="?attr/color_main2_500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/title"
+                    app:layout_constraintBottom_toBottomOf="@id/title"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/password_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="16dp"
-                android:labelFor="@id/password"
-                android:text="@{@string/password + `*`, default=`Password*`}"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/sip_identity"
-                app:layout_constraintStart_toStartOf="@id/password"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/sip_identity_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/sip_identity"
+                    android:text="@{@string/username + `*`, default=`Username*`}"
+                    app:layout_constraintTop_toBottomOf="@id/title"
+                    app:layout_constraintStart_toStartOf="@id/sip_identity"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/password"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.password, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:hint="@string/password"
-                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/password_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/sip_identity"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.sipIdentity, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textNoSuggestions"
+                    android:hint="@string/username"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/sip_identity_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <ImageView
-                android:id="@+id/eye"
-                android:onClick="@{() -> viewModel.toggleShowPassword()}"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="0dp"
-                android:padding="4dp"
-                android:layout_marginEnd="20dp"
-                android:contentDescription="@string/content_description_toggle_password_visibility"
-                android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintEnd_toEndOf="@id/password"
-                app:layout_constraintTop_toTopOf="@id/password"
-                app:layout_constraintBottom_toBottomOf="@id/password" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/password_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:labelFor="@id/password"
+                    android:text="@{@string/password + `*`, default=`Password*`}"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/sip_identity"
+                    app:layout_constraintStart_toStartOf="@id/password"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/primary_button_label_style"
-                android:id="@+id/login"
-                android:onClick="@{() -> viewModel.login()}"
-                android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_account_login"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintTop_toBottomOf="@id/password"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/password"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.password, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:hint="@string/password"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/password_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style_600"
-                android:id="@+id/forgotten_password"
-                android:onClick="@{forgottenPasswordClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingTop="13dp"
-                android:paddingBottom="13dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_forgotten_password"
-                android:textSize="13sp"
-                android:textColor="?attr/color_main2_500"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/login"/>
+                <ImageView
+                    android:id="@+id/eye"
+                    android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                    android:layout_width="@dimen/icon_size"
+                    android:layout_height="0dp"
+                    android:padding="4dp"
+                    android:layout_marginEnd="20dp"
+                    android:contentDescription="@string/content_description_toggle_password_visibility"
+                    android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintEnd_toEndOf="@id/password"
+                    app:layout_constraintTop_toTopOf="@id/password"
+                    app:layout_constraintBottom_toBottomOf="@id/password" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/or"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="28dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:text="@string/or"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_500"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/forgotten_password"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/primary_button_label_style"
+                    android:id="@+id/login"
+                    android:onClick="@{() -> viewModel.login()}"
+                    android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_account_login"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/password"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginStart="16dp"
-                android:background="?attr/color_main2_200"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/or"
-                app:layout_constraintTop_toTopOf="@id/or"
-                app:layout_constraintBottom_toBottomOf="@id/or"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style_600"
+                    android:id="@+id/forgotten_password"
+                    android:onClick="@{forgottenPasswordClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:paddingTop="13dp"
+                    android:paddingBottom="13dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_forgotten_password"
+                    android:textSize="13sp"
+                    android:textColor="?attr/color_main2_500"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/login"/>
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginEnd="16dp"
-                android:background="?attr/color_main2_200"
-                app:layout_constraintStart_toEndOf="@id/or"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/or"
-                app:layout_constraintBottom_toBottomOf="@id/or"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/or"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="28dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
+                    android:text="@string/or"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_500"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/forgotten_password"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/secondary_button_label_style"
-                android:id="@+id/scan_qr_code"
-                android:onClick="@{qrCodeClickListener}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="22dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_scan_qr_code"
-                android:drawableStart="@drawable/qr_code"
-                android:drawablePadding="8dp"
-                android:visibility="@{viewModel.hideScanQrCode ? View.GONE : View.VISIBLE}"
-                app:drawableTint="@color/secondary_button_label_color"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/or" />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="16dp"
+                    android:background="?attr/color_main2_200"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/or"
+                    app:layout_constraintTop_toTopOf="@id/or"
+                    app:layout_constraintBottom_toBottomOf="@id/or"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/secondary_button_label_style"
-                android:id="@+id/third_party_sip_account"
-                android:onClick="@{thirdPartySipAccountLoginClickListener}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_login_third_party_sip_account"
-                android:visibility="@{viewModel.hideThirdPartyAccount ? View.GONE : View.VISIBLE}"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/scan_qr_code" />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="?attr/color_main2_200"
+                    app:layout_constraintStart_toEndOf="@id/or"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/or"
+                    app:layout_constraintBottom_toBottomOf="@id/or"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/no_account_yet"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:text="@string/assistant_no_account_yet"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_700"
-                android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
-                app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/register"
-                app:layout_constraintTop_toTopOf="@id/register"
-                app:layout_constraintBottom_toBottomOf="@id/register"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/secondary_button_label_style"
+                    android:id="@+id/scan_qr_code"
+                    android:onClick="@{qrCodeClickListener}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="22dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_scan_qr_code"
+                    android:drawableStart="@drawable/qr_code"
+                    android:drawablePadding="8dp"
+                    android:visibility="@{viewModel.hideScanQrCode ? View.GONE : View.VISIBLE}"
+                    app:drawableTint="@color/secondary_button_label_color"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/or" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/primary_button_label_style"
-                android:id="@+id/register"
-                android:onClick="@{registerClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="40dp"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_account_register"
-                android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
-                app:layout_constraintVertical_bias="1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/no_account_yet"
-                app:layout_constraintTop_toBottomOf="@id/third_party_sip_account"
-                app:layout_constraintBottom_toTopOf="@id/mountains"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/secondary_button_label_style"
+                    android:id="@+id/third_party_sip_account"
+                    android:onClick="@{thirdPartySipAccountLoginClickListener}"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_login_third_party_sip_account"
+                    android:visibility="@{viewModel.hideThirdPartyAccount ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/scan_qr_code" />
 
-            <ImageView
-                android:id="@+id/mountains"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:tint="?attr/color_main1_500" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/no_account_yet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/assistant_no_account_yet"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_700"
+                    android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/register"
+                    app:layout_constraintTop_toTopOf="@id/register"
+                    app:layout_constraintBottom_toBottomOf="@id/register"/>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/primary_button_label_style"
+                    android:id="@+id/register"
+                    android:onClick="@{registerClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="40dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginBottom="@dimen/screen_bottom_margin"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_account_register"
+                    android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintVertical_bias="1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/no_account_yet"
+                    app:layout_constraintTop_toBottomOf="@id/third_party_sip_account"
+                    app:layout_constraintBottom_toTopOf="@id/mountains"/>
 
-    </ScrollView>
+                <ImageView
+                    android:id="@+id/mountains"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/mountains"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="?attr/color_main1_500" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+
+        <include
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.registrationInProgress}" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index a256e2205..43bcfe574 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
 
     <data>
         <import type="android.view.View" />
@@ -13,354 +14,364 @@
             type="org.linphone.ui.assistant.viewmodel.ThirdPartySipAccountLoginViewModel" />
     </data>
 
-    <ScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
         android:background="?attr/color_main2_000">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
-            <ImageView
-                style="@style/icon_top_bar_button_style"
-                android:id="@+id/back"
-                android:onClick="@{backClickListener}"
-                android:layout_width="@dimen/top_bar_height"
-                android:layout_height="@dimen/top_bar_height"
-                android:src="@drawable/caret_left"
-                android:contentDescription="@string/content_description_go_back_icon"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"/>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/assistant_page_title_style"
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/assistant_login_third_party_sip_account_title"
-                android:textColor="?attr/color_text"
-                app:layout_constraintTop_toTopOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/back"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <ImageView
+                    style="@style/icon_top_bar_button_style"
+                    android:id="@+id/back"
+                    android:onClick="@{backClickListener}"
+                    android:layout_width="@dimen/top_bar_height"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:src="@drawable/caret_left"
+                    android:contentDescription="@string/content_description_go_back_icon"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/username_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="38dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/username"
-                android:text="@{@string/username + `*`}"
-                app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="@id/username"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/assistant_page_title_style"
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/assistant_login_third_party_sip_account_title"
+                    android:textColor="?attr/color_text"
+                    app:layout_constraintTop_toTopOf="@id/back"
+                    app:layout_constraintBottom_toBottomOf="@id/back"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/username"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.username, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text"
-                android:hint="@string/username"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/username_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/username_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="38dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/username"
+                    android:text="@{@string/username + `*`}"
+                    app:layout_constraintTop_toBottomOf="@id/title"
+                    app:layout_constraintStart_toStartOf="@id/username"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/password_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="16dp"
-                android:labelFor="@id/password"
-                android:text="@{@string/password + `*`}"
-                app:layout_constraintTop_toBottomOf="@id/username"
-                app:layout_constraintStart_toStartOf="@id/password"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/username"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.username, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text"
+                    android:hint="@string/username"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/username_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/password"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.password, default=`johndoe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:hint="@string/password"
-                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/password_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/password_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:labelFor="@id/password"
+                    android:text="@{@string/password + `*`}"
+                    app:layout_constraintTop_toBottomOf="@id/username"
+                    app:layout_constraintStart_toStartOf="@id/password"/>
 
-            <ImageView
-                android:onClick="@{() -> viewModel.toggleShowPassword()}"
-                android:id="@+id/eye"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="0dp"
-                android:layout_marginEnd="20dp"
-                android:padding="4dp"
-                android:contentDescription="@string/content_description_toggle_password_visibility"
-                android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintEnd_toEndOf="@id/password"
-                app:layout_constraintTop_toTopOf="@id/password"
-                app:layout_constraintBottom_toBottomOf="@id/password" />
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/password"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.password, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:hint="@string/password"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/password_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/domain_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/domain"
-                android:text="@{@string/sip_address_domain + `*`, default=`Domain*`}"
-                app:layout_constraintTop_toBottomOf="@id/password"
-                app:layout_constraintStart_toStartOf="@id/domain"/>
+                <ImageView
+                    android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                    android:id="@+id/eye"
+                    android:layout_width="@dimen/icon_size"
+                    android:layout_height="0dp"
+                    android:layout_marginEnd="20dp"
+                    android:padding="4dp"
+                    android:contentDescription="@string/content_description_toggle_password_visibility"
+                    android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintEnd_toEndOf="@id/password"
+                    app:layout_constraintTop_toTopOf="@id/password"
+                    app:layout_constraintBottom_toBottomOf="@id/password" />
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/domain"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.domain, default=`sip.example.net`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textUri"
-                android:hint="@string/sip_address_domain"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/domain_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/domain_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/domain"
+                    android:text="@{@string/sip_address_domain + `*`, default=`Domain*`}"
+                    app:layout_constraintTop_toBottomOf="@id/password"
+                    app:layout_constraintStart_toStartOf="@id/domain"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/display_name_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/display_name"
-                android:text="@string/sip_address_display_name"
-                app:layout_constraintTop_toBottomOf="@id/domain"
-                app:layout_constraintStart_toStartOf="@id/display_name"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/domain"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.domain, default=`sip.example.net`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textUri"
+                    android:hint="@string/sip_address_domain"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/domain_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/display_name"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.displayName, default=`John Doe`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textPersonName|textCapSentences"
-                android:hint="@string/sip_address_display_name"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/display_name_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/display_name_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/display_name"
+                    android:text="@string/sip_address_display_name"
+                    app:layout_constraintTop_toBottomOf="@id/domain"
+                    app:layout_constraintStart_toStartOf="@id/display_name"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/transport_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/transport"
-                android:text="@string/assistant_sip_account_transport_protocol"
-                app:layout_constraintTop_toBottomOf="@id/display_name"
-                app:layout_constraintStart_toStartOf="@id/transport"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/display_name"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.displayName, default=`John Doe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textPersonName|textCapSentences"
+                    android:hint="@string/sip_address_display_name"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/display_name_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/transport"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:background="@drawable/edit_text_background"
-                android:overlapAnchor="false"
-                android:spinnerMode="dropdown"
-                android:popupBackground="@drawable/shape_squircle_white_background"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/transport_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/transport_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/transport"
+                    android:text="@string/assistant_sip_account_transport_protocol"
+                    app:layout_constraintTop_toBottomOf="@id/display_name"
+                    app:layout_constraintStart_toStartOf="@id/transport"/>
 
-            <ImageView
-                android:id="@+id/transport_caret"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:src="@drawable/caret_down"
-                android:contentDescription="@null"
-                app:tint="?attr/color_main2_600"
-                app:layout_constraintTop_toTopOf="@id/transport"
-                app:layout_constraintBottom_toBottomOf="@id/transport"
-                app:layout_constraintEnd_toEndOf="@id/transport"/>
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/transport"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:background="@drawable/edit_text_background"
+                    android:overlapAnchor="false"
+                    android:spinnerMode="dropdown"
+                    android:popupBackground="@drawable/shape_squircle_white_background"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/transport_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/section_header_style"
-                android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
-                android:id="@+id/advanced_settings"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:layout_marginStart="26dp"
-                android:layout_marginEnd="26dp"
-                android:layout_marginTop="32dp"
-                android:text="@string/settings_advanced_title"
-                android:drawableEnd="@{viewModel.expandAdvancedSettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-                android:drawableTint="?attr/color_main2_600"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/transport"/>
+                <ImageView
+                    android:id="@+id/transport_caret"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="20dp"
+                    android:src="@drawable/caret_down"
+                    android:contentDescription="@null"
+                    app:tint="?attr/color_main2_600"
+                    app:layout_constraintTop_toTopOf="@id/transport"
+                    app:layout_constraintBottom_toBottomOf="@id/transport"
+                    app:layout_constraintEnd_toEndOf="@id/transport"/>
 
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/advanced_settings_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:constraint_referenced_ids="authentication_id_label, authentication_id, outbound_proxy_label, outbound_proxy"
-                android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/section_header_style"
+                    android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
+                    android:id="@+id/advanced_settings"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginStart="26dp"
+                    android:layout_marginEnd="26dp"
+                    android:layout_marginTop="32dp"
+                    android:text="@string/settings_advanced_title"
+                    android:drawableEnd="@{viewModel.expandAdvancedSettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                    android:drawableTint="?attr/color_main2_600"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/transport"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/authentication_id_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/authentication_id"
-                android:text="@string/authentication_id"
-                app:layout_constraintTop_toBottomOf="@id/advanced_settings"
-                app:layout_constraintStart_toStartOf="@id/authentication_id"/>
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/advanced_settings_group"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:constraint_referenced_ids="authentication_id_label, authentication_id, outbound_proxy_label, outbound_proxy"
+                    android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" />
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/authentication_id"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.authId}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text"
-                android:hint="@string/authentication_id"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/authentication_id_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/authentication_id_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/authentication_id"
+                    android:text="@string/authentication_id"
+                    app:layout_constraintTop_toBottomOf="@id/advanced_settings"
+                    app:layout_constraintStart_toStartOf="@id/authentication_id"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/header_style"
-                android:id="@+id/outbound_proxy_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:labelFor="@id/outbound_proxy"
-                android:text="@string/account_settings_sip_proxy_url_title"
-                app:layout_constraintTop_toBottomOf="@id/authentication_id"
-                app:layout_constraintStart_toStartOf="@id/outbound_proxy"/>
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/authentication_id"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.authId}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text"
+                    android:hint="@string/authentication_id"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/authentication_id_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatEditText
-                style="@style/default_text_style"
-                android:id="@+id/outbound_proxy"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@={viewModel.outboundProxy, default=`sip12.example.net`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textUri"
-                android:hint="@string/account_settings_sip_proxy_url_title"
-                app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                app:layout_constraintTop_toBottomOf="@id/outbound_proxy_label"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/outbound_proxy_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:labelFor="@id/outbound_proxy"
+                    android:text="@string/account_settings_sip_proxy_url_title"
+                    app:layout_constraintTop_toBottomOf="@id/authentication_id"
+                    app:layout_constraintStart_toStartOf="@id/outbound_proxy"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/primary_button_label_style"
-                android:onClick="@{() -> viewModel.login()}"
-                android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
-                android:id="@+id/login"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_account_login"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintVertical_bias="1"
-                app:layout_constraintTop_toBottomOf="@id/outbound_proxy"
-                app:layout_constraintBottom_toTopOf="@id/mountains"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/outbound_proxy"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.outboundProxy, default=`sip12.example.net`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:inputType="text|textUri"
+                    android:hint="@string/account_settings_sip_proxy_url_title"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/outbound_proxy_label"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <ImageView
-                android:id="@+id/mountains"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:tint="?attr/color_main1_500" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/primary_button_label_style"
+                    android:onClick="@{() -> viewModel.login()}"
+                    android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
+                    android:id="@+id/login"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="@dimen/screen_bottom_margin"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_account_login"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintVertical_bias="1"
+                    app:layout_constraintTop_toBottomOf="@id/outbound_proxy"
+                    app:layout_constraintBottom_toTopOf="@id/mountains"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <ImageView
+                    android:id="@+id/mountains"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/mountains"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="?attr/color_main1_500" />
 
-    </ScrollView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+
+        <include
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.registrationInProgress}" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file