diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
index 16f02166c..c0a9c1c84 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
@@ -39,7 +39,7 @@ import org.linphone.databinding.AssistantLandingFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.GenericFragment
 import org.linphone.ui.assistant.model.AcceptConditionsAndPolicyDialogModel
-import org.linphone.ui.assistant.viewmodel.LandingViewModel
+import org.linphone.ui.assistant.viewmodel.AccountLoginViewModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.PhoneNumberUtils
 
@@ -51,7 +51,7 @@ class LandingFragment : GenericFragment() {
 
     private lateinit var binding: AssistantLandingFragmentBinding
 
-    private val viewModel: LandingViewModel by navGraphViewModels(
+    private val viewModel: AccountLoginViewModel by navGraphViewModels(
         R.id.assistant_nav_graph
     )
 
@@ -117,15 +117,8 @@ class LandingFragment : GenericFragment() {
 
         viewModel.accountLoggedInEvent.observe(viewLifecycleOwner) {
             it.consume { firstAccount ->
-                Log.i("$TAG Account successfully logged-in")
-                if (firstAccount) {
-                    Log.i("$TAG First account, going to secure/interop mode chooser")
-                    val action = LandingFragmentDirections.actionLandingFragmentToProfileModeFragment()
-                    findNavController().navigate(action)
-                } else {
-                    Log.i("$TAG Not first account, leaving assistant")
-                    requireActivity().finish()
-                }
+                Log.i("$TAG Account successfully logged-in, leaving assistant")
+                requireActivity().finish()
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
deleted file mode 100644
index a97747747..000000000
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.assistant.fragment
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.UiThread
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import androidx.navigation.navGraphViewModels
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.tools.Log
-import org.linphone.databinding.AssistantLoginFragmentBinding
-import org.linphone.ui.GenericActivity
-import org.linphone.ui.GenericFragment
-import org.linphone.ui.assistant.viewmodel.AccountLoginViewModel
-import org.linphone.utils.PhoneNumberUtils
-
-@UiThread
-class LoginFragment : GenericFragment() {
-    companion object {
-        private const val TAG = "[Login Fragment]"
-    }
-
-    private lateinit var binding: AssistantLoginFragmentBinding
-
-    private val args: LoginFragmentArgs by navArgs()
-
-    private val viewModel: AccountLoginViewModel by navGraphViewModels(
-        R.id.assistant_nav_graph
-    )
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = AssistantLoginFragmentBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.viewModel = viewModel
-        observeToastEvents(viewModel)
-
-        binding.setBackClickListener {
-            goBack()
-        }
-
-        val identity = args.sipIdentity
-        viewModel.sipIdentity.value = identity
-
-        binding.setForgottenPasswordClickListener {
-            val url = getString(R.string.web_platform_forgotten_password_url)
-            try {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                startActivity(browserIntent)
-            } catch (ise: IllegalStateException) {
-                Log.e(
-                    "$TAG Can't start ACTION_VIEW intent for URL [$url], IllegalStateException: $ise"
-                )
-            }
-        }
-
-        viewModel.showPassword.observe(viewLifecycleOwner) {
-            lifecycleScope.launch {
-                delay(50)
-                binding.password.setSelection(binding.password.text?.length ?: 0)
-            }
-        }
-
-        viewModel.accountLoggedInEvent.observe(viewLifecycleOwner) {
-            it.consume { firstAccount ->
-                Log.i("$TAG Account successfully logged-in")
-                if (firstAccount) {
-                    Log.i("$TAG First account, going to secure/interop mode chooser")
-                    val action = LoginFragmentDirections.actionLoginFragmentToProfileModeFragment()
-                    findNavController().navigate(action)
-                } else {
-                    Log.i("$TAG Not first account, leaving assistant")
-                    requireActivity().finish()
-                }
-            }
-        }
-
-        viewModel.accountLoginErrorEvent.observe(viewLifecycleOwner) {
-            it.consume { message ->
-                (requireActivity() as GenericActivity).showRedToast(
-                    message,
-                    R.drawable.warning_circle
-                )
-            }
-        }
-
-        coreContext.postOnCoreThread {
-            val dialPlan = PhoneNumberUtils.getDeviceDialPlan(requireContext())
-            if (dialPlan != null) {
-                viewModel.internationalPrefix.postValue(dialPlan.countryCallingCode)
-                viewModel.internationalPrefixIsoCountryCode.postValue(dialPlan.isoCountryCode)
-            }
-        }
-    }
-
-    private fun goBack() {
-        findNavController().popBackStack()
-    }
-}
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/ProfileModeFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/ProfileModeFragment.kt
deleted file mode 100644
index f2ebed5ef..000000000
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/ProfileModeFragment.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.assistant.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.UiThread
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.navGraphViewModels
-import org.linphone.R
-import org.linphone.databinding.AssistantSecureModeFragmentBinding
-import org.linphone.ui.GenericFragment
-import org.linphone.ui.assistant.viewmodel.AccountLoginViewModel
-import org.linphone.utils.DialogUtils
-
-@UiThread
-class ProfileModeFragment : GenericFragment() {
-    companion object {
-        private const val TAG = "[Profile Mode Fragment]"
-    }
-
-    private lateinit var binding: AssistantSecureModeFragmentBinding
-
-    private val viewModel: AccountLoginViewModel by navGraphViewModels(
-        R.id.assistant_nav_graph
-    )
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = AssistantSecureModeFragmentBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.viewModel = viewModel
-        observeToastEvents(viewModel)
-
-        binding.setBackClickListener {
-            findNavController().popBackStack()
-        }
-
-        binding.setContinueClickListener {
-            viewModel.applySelectedMode()
-            requireActivity().finish()
-        }
-
-        binding.setDefaultModeTooltipClickListener {
-            val dialog = DialogUtils.getAccountModeExplanationDialog(requireActivity(), true)
-            dialog.show()
-        }
-
-        binding.setInteropModeTooltipClickListener {
-            val dialog = DialogUtils.getAccountModeExplanationDialog(requireActivity(), false)
-            dialog.show()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt
index 1b29e899f..3132b03bd 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt
@@ -66,13 +66,11 @@ class RegisterCodeConfirmationFragment : GenericFragment() {
             goBack()
         }
 
-        viewModel.goToLoginPageEvent.observe(viewLifecycleOwner) {
+        viewModel.accountCreatedEvent.observe(viewLifecycleOwner) {
             it.consume {
-                Log.i("$TAG Going to login fragment")
                 val identity = viewModel.username.value.orEmpty()
-                val action = RegisterCodeConfirmationFragmentDirections.actionRegisterCodeConfirmationFragmentToLoginFragment(
-                    identity
-                )
+                Log.i("$TAG Account [$identity] has been created")
+                val action = RegisterCodeConfirmationFragmentDirections.actionRegisterCodeConfirmationFragmentToLandingFragment()
                 findNavController().navigate(action)
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
index f1067e824..59ee82fa9 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
@@ -92,7 +92,7 @@ class AccountCreationViewModel @UiThread constructor() : GenericViewModel() {
 
     val goToSmsCodeConfirmationViewEvent = MutableLiveData<Event<Boolean>>()
 
-    val goToLoginPageEvent = MutableLiveData<Event<Boolean>>()
+    val accountCreatedEvent = MutableLiveData<Event<Boolean>>()
 
     val errorHappenedEvent: MutableLiveData<Event<String>> by lazy {
         MutableLiveData<Event<String>>()
@@ -214,7 +214,7 @@ class AccountCreationViewModel @UiThread constructor() : GenericViewModel() {
 
             if (status == AccountCreator.Status.AccountActivated) {
                 Log.i("$TAG Account has been successfully activated, going to login page")
-                goToLoginPageEvent.postValue(Event(true))
+                accountCreatedEvent.postValue(Event(true))
             } else {
                 Log.e("$TAG Account couldn't be activated, an unexpected error occurred!")
                 errorHappenedEvent.postValue(
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
index 6bdcb78dd..2605e5431 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
@@ -45,6 +45,14 @@ open class AccountLoginViewModel @UiThread constructor() : GenericViewModel() {
         private const val TAG = "[Account Login ViewModel]"
     }
 
+    val showBackButton = MutableLiveData<Boolean>()
+
+    val hideCreateAccount = MutableLiveData<Boolean>()
+
+    val hideScanQrCode = MutableLiveData<Boolean>()
+
+    val hideThirdPartyAccount = MutableLiveData<Boolean>()
+
     val sipIdentity = MutableLiveData<String>()
 
     val password = MutableLiveData<String>()
@@ -69,6 +77,8 @@ open class AccountLoginViewModel @UiThread constructor() : GenericViewModel() {
         MutableLiveData<Event<String>>()
     }
 
+    var conditionsAndPrivacyPolicyAccepted = false
+
     private lateinit var newlyCreatedAuthInfo: AuthInfo
     private lateinit var newlyCreatedAccount: Account
 
@@ -116,6 +126,15 @@ open class AccountLoginViewModel @UiThread constructor() : GenericViewModel() {
     }
 
     init {
+        coreContext.postOnCoreThread { core ->
+            // Prevent user from leaving assistant if no account was configured yet
+            showBackButton.postValue(core.accountList.isNotEmpty())
+            hideCreateAccount.postValue(corePreferences.hideAssistantCreateAccount)
+            hideScanQrCode.postValue(corePreferences.hideAssistantScanQrCode)
+            hideThirdPartyAccount.postValue(corePreferences.hideAssistantThirdPartySipAccount)
+            conditionsAndPrivacyPolicyAccepted = corePreferences.conditionsAndPrivacyPolicyAccepted
+        }
+
         showPassword.value = false
         registrationInProgress.value = false
 
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/LandingViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/LandingViewModel.kt
deleted file mode 100644
index ad9a2569c..000000000
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/LandingViewModel.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.assistant.viewmodel
-
-import androidx.annotation.UiThread
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-
-class LandingViewModel @UiThread constructor() : AccountLoginViewModel() {
-    companion object {
-        private const val TAG = "[Account Login ViewModel]"
-    }
-
-    val showBackButton = MutableLiveData<Boolean>()
-
-    val hideCreateAccount = MutableLiveData<Boolean>()
-
-    val hideScanQrCode = MutableLiveData<Boolean>()
-
-    val hideThirdPartyAccount = MutableLiveData<Boolean>()
-
-    var conditionsAndPrivacyPolicyAccepted = false
-
-    init {
-        coreContext.postOnCoreThread { core ->
-            // Prevent user from leaving assistant if no account was configured yet
-            showBackButton.postValue(core.accountList.isNotEmpty())
-            hideCreateAccount.postValue(corePreferences.hideAssistantCreateAccount)
-            hideScanQrCode.postValue(corePreferences.hideAssistantScanQrCode)
-            hideThirdPartyAccount.postValue(corePreferences.hideAssistantThirdPartySipAccount)
-            conditionsAndPrivacyPolicyAccepted = corePreferences.conditionsAndPrivacyPolicyAccepted
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
index e02628c65..104a1e367 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
@@ -114,11 +114,11 @@ class AccountSettingsFragment : GenericMainFragment() {
                         val currentTransport = viewModel.selectedTransport.value?.name?.uppercase(
                             Locale.getDefault()
                         )
-                        binding.transportSpinner.adapter = adapter
-                        binding.transportSpinner.setSelection(
+                        binding.accountAdvancedSettings.transportSpinner.adapter = adapter
+                        binding.accountAdvancedSettings.transportSpinner.setSelection(
                             viewModel.availableTransports.indexOf(currentTransport)
                         )
-                        binding.transportSpinner.onItemSelectedListener = dropdownListener
+                        binding.accountAdvancedSettings.transportSpinner.onItemSelectedListener = dropdownListener
                     }
                 } else {
                     Log.e(
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
index 159c1a3fd..369d59e87 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
@@ -37,6 +37,8 @@ class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() {
         private const val TAG = "[Account Settings ViewModel]"
     }
 
+    val expandAdvancedSettings = MutableLiveData<Boolean>()
+
     val pushNotificationsAvailable = MutableLiveData<Boolean>()
 
     val pushNotificationsEnabled = MutableLiveData<Boolean>()
@@ -79,15 +81,17 @@ class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() {
     private lateinit var natPolicy: NatPolicy
 
     init {
+        expandAdvancedSettings.value = false
+
         availableTransports.add(TransportType.Udp.name.uppercase(Locale.getDefault()))
         availableTransports.add(TransportType.Tcp.name.uppercase(Locale.getDefault()))
         availableTransports.add(TransportType.Tls.name.uppercase(Locale.getDefault()))
 
         imEncryptionMandatoryAvailable.addSource(limeServerUrl) {
-            imEncryptionMandatoryAvailable.value = isImEncrptionMandatoryAvailable()
+            imEncryptionMandatoryAvailable.value = isImEncryptionMandatoryAvailable()
         }
         imEncryptionMandatoryAvailable.addSource(conferenceFactoryUri) {
-            imEncryptionMandatoryAvailable.value = isImEncrptionMandatoryAvailable()
+            imEncryptionMandatoryAvailable.value = isImEncryptionMandatoryAvailable()
         }
     }
 
@@ -207,7 +211,12 @@ class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() {
     }
 
     @UiThread
-    fun isImEncrptionMandatoryAvailable(): Boolean {
+    fun isImEncryptionMandatoryAvailable(): Boolean {
         return limeServerUrl.value.orEmpty().isNotEmpty() && conferenceFactoryUri.value.orEmpty().isNotEmpty()
     }
+
+    @UiThread
+    fun toggleAdvancedSettingsExpand() {
+        expandAdvancedSettings.value = expandAdvancedSettings.value == false
+    }
 }
diff --git a/app/src/main/res/layout/account_advanced_settings.xml b/app/src/main/res/layout/account_advanced_settings.xml
new file mode 100644
index 000000000..bfb8e0e7d
--- /dev/null
+++ b/app/src/main/res/layout/account_advanced_settings.xml
@@ -0,0 +1,389 @@
+<?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">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.main.settings.viewmodel.AccountSettingsViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_squircle_white_background">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/transport_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/assistant_sip_account_transport_protocol"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/transport_spinner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:background="@drawable/edit_text_background"
+            android:paddingStart="15dp"
+            android:paddingEnd="30dp"
+            android:overlapAnchor="false"
+            android:spinnerMode="dropdown"
+            android:popupBackground="@drawable/shape_squircle_white_background"
+            app:layout_constraintTop_toBottomOf="@id/transport_title"
+            app:layout_constraintStart_toStartOf="@id/transport_title"
+            app:layout_constraintEnd_toEndOf="@id/transport_title" />
+
+        <ImageView
+            android:id="@+id/transport_spinner_caret"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/spinner_caret_end_margin"
+            android:src="@drawable/caret_down"
+            android:contentDescription="@null"
+            app:layout_constraintTop_toTopOf="@id/transport_spinner"
+            app:layout_constraintBottom_toBottomOf="@id/transport_spinner"
+            app:layout_constraintEnd_toEndOf="@id/transport_spinner"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/sip_proxy_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/account_settings_sip_proxy_url_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toBottomOf="@id/transport_spinner"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            style="@style/default_text_style"
+            android:id="@+id/sip_proxy"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:background="@drawable/edit_text_background"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:text="@={viewModel.sipProxyServer}"
+            android:inputType="text|textUri"
+            android:hint="@string/account_settings_sip_proxy_url_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sip_proxy_title"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/outbound_proxy_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@={viewModel.outboundProxyEnabled}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sip_proxy" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/outbound_proxy_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/account_settings_outbound_proxy_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/outbound_proxy_switch"
+            app:layout_constraintBottom_toBottomOf="@id/outbound_proxy_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/outbound_proxy_switch"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/stun_server_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/account_settings_stun_server_url_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toBottomOf="@id/outbound_proxy_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            style="@style/default_text_style"
+            android:id="@+id/stun_server"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:background="@drawable/edit_text_background"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:text="@={viewModel.stunServer}"
+            android:inputType="text|textUri"
+            android:hint="@string/account_settings_stun_server_url_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/stun_server_title"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/ice_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@={viewModel.iceEnabled}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/stun_server" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/ice_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/account_settings_enable_ice_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/ice_switch"
+            app:layout_constraintBottom_toBottomOf="@id/ice_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/ice_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/avpf_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@={viewModel.avpfEnabled}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ice_switch" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/avpf_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/account_settings_avpf_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/avpf_switch"
+            app:layout_constraintBottom_toBottomOf="@id/avpf_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/avpf_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/bundle_mode_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@={viewModel.bundleModeEnabled}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/avpf_switch" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/bundle_mode_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/account_settings_bundle_mode_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/bundle_mode_switch"
+            app:layout_constraintBottom_toBottomOf="@id/bundle_mode_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/bundle_mode_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/cpim_basic_chat_room_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@={viewModel.cpimInBasicChatRooms}"
+            android:visibility="@{viewModel.imEncryptionMandatory ? View.GONE : View.VISIBLE}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/bundle_mode_switch" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/cpim_basic_chat_room_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/account_settings_cpim_in_basic_conversations_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:visibility="@{viewModel.imEncryptionMandatory ? View.GONE : View.VISIBLE}"
+            app:layout_constraintTop_toTopOf="@id/cpim_basic_chat_room_switch"
+            app:layout_constraintBottom_toBottomOf="@id/cpim_basic_chat_room_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/cpim_basic_chat_room_switch"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/expire_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/account_settings_expire_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toBottomOf="@id/cpim_basic_chat_room_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            style="@style/default_text_style"
+            android:id="@+id/expire"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:background="@drawable/edit_text_background"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:text="@={viewModel.expire}"
+            android:inputType="number"
+            android:hint="@string/account_settings_expire_title"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/expire_title"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/conference_factory_uri_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/account_settings_conference_factory_uri_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toBottomOf="@id/expire"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            style="@style/default_text_style"
+            android:id="@+id/conference_factory_uri"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:background="@drawable/edit_text_background"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:enabled="@{!viewModel.imEncryptionMandatory}"
+            android:text="@={viewModel.conferenceFactoryUri}"
+            android:inputType="text|textUri"
+            android:hint="@string/account_settings_conference_factory_uri_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/conference_factory_uri_title"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/audio_video_conference_factory_uri_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/account_settings_audio_video_conference_factory_uri_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toBottomOf="@id/conference_factory_uri"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            style="@style/default_text_style"
+            android:id="@+id/audio_video_conference_factory_uri"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:background="@drawable/edit_text_background"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:text="@={viewModel.audioVideoConferenceFactoryUri}"
+            android:inputType="text|textUri"
+            android:hint="@string/account_settings_audio_video_conference_factory_uri_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri_title"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/lime_server_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/account_settings_lime_server_url_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            style="@style/default_text_style"
+            android:id="@+id/lime_server"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="@dimen/screen_bottom_margin"
+            android:background="@drawable/edit_text_background"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:enabled="@{!viewModel.imEncryptionMandatory}"
+            android:text="@={viewModel.limeServerUrl}"
+            android:inputType="text|textUri"
+            android:hint="@string/account_settings_lime_server_url_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/lime_server_title"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml
index 708ee5fba..95555bb77 100644
--- a/app/src/main/res/layout/account_settings_fragment.xml
+++ b/app/src/main/res/layout/account_settings_fragment.xml
@@ -1,7 +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">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
 
     <data>
         <import type="android.view.View" />
@@ -57,468 +57,138 @@
                 app:layout_constraintTop_toBottomOf="@id/title"
                 app:layout_constraintBottom_toBottomOf="parent">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        style="@style/material_switch_style"
-                        android:id="@+id/push_notifications_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginEnd="16dp"
-                        android:enabled="@{viewModel.pushNotificationsAvailable}"
-                        android:checked="@={viewModel.pushNotificationsEnabled}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/push_notifications_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="10dp"
-                        android:text="@{viewModel.pushNotificationsAvailable ? @string/account_settings_push_notification_title : @string/account_settings_push_notification_not_available_title, default=@string/account_settings_push_notification_title}"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintBottom_toBottomOf="@id/push_notifications_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/push_notifications_switch"/>
-
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        style="@style/material_switch_style"
-                        android:id="@+id/im_encryption_mandatory_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:checked="@={viewModel.imEncryptionMandatory}"
-                        android:visibility="@{viewModel.imEncryptionMandatoryAvailable ? View.VISIBLE : View.GONE}"
-                        app:layout_constraintTop_toBottomOf="@id/push_notifications_switch"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/im_encryption_mandatory_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/account_settings_im_encryption_mandatory_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        android:visibility="@{viewModel.imEncryptionMandatoryAvailable ? View.VISIBLE : View.GONE}"
-                        app:layout_constraintTop_toTopOf="@id/im_encryption_mandatory_switch"
-                        app:layout_constraintBottom_toBottomOf="@id/im_encryption_mandatory_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/im_encryption_mandatory_switch"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/transport_title"
-                        android:layout_width="0dp"
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:text="@string/assistant_sip_account_transport_protocol"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/im_encryption_mandatory_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
+                        android:background="@drawable/shape_squircle_white_background">
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/transport_spinner"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="15dp"
-                        android:paddingEnd="30dp"
-                        android:overlapAnchor="false"
-                        android:spinnerMode="dropdown"
-                        android:popupBackground="@drawable/shape_squircle_white_background"
-                        app:layout_constraintTop_toBottomOf="@id/transport_title"
-                        app:layout_constraintStart_toStartOf="@id/transport_title"
-                        app:layout_constraintEnd_toEndOf="@id/transport_title" />
+                        <com.google.android.material.materialswitch.MaterialSwitch
+                            style="@style/material_switch_style"
+                            android:id="@+id/push_notifications_switch"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:layout_marginEnd="16dp"
+                            android:enabled="@{viewModel.pushNotificationsAvailable}"
+                            android:checked="@={viewModel.pushNotificationsEnabled}"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"/>
 
-                    <ImageView
-                        android:id="@+id/transport_spinner_caret"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/spinner_caret_end_margin"
-                        android:src="@drawable/caret_down"
-                        android:contentDescription="@null"
-                        app:layout_constraintTop_toTopOf="@id/transport_spinner"
-                        app:layout_constraintBottom_toBottomOf="@id/transport_spinner"
-                        app:layout_constraintEnd_toEndOf="@id/transport_spinner"/>
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/settings_title_style"
+                            android:id="@+id/push_notifications_title"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="10dp"
+                            android:text="@{viewModel.pushNotificationsAvailable ? @string/account_settings_push_notification_title : @string/account_settings_push_notification_not_available_title, default=@string/account_settings_push_notification_title}"
+                            android:maxLines="2"
+                            android:ellipsize="end"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="@id/push_notifications_switch"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/push_notifications_switch"/>
+
+                        <com.google.android.material.materialswitch.MaterialSwitch
+                            style="@style/material_switch_style"
+                            android:id="@+id/im_encryption_mandatory_switch"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:layout_marginEnd="16dp"
+                            android:checked="@={viewModel.imEncryptionMandatory}"
+                            android:visibility="@{viewModel.imEncryptionMandatoryAvailable ? View.VISIBLE : View.GONE}"
+                            app:layout_constraintTop_toBottomOf="@id/push_notifications_switch"
+                            app:layout_constraintEnd_toEndOf="parent"/>
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/settings_title_style"
+                            android:id="@+id/im_encryption_mandatory_title"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="10dp"
+                            android:text="@string/account_settings_im_encryption_mandatory_title"
+                            android:maxLines="2"
+                            android:ellipsize="end"
+                            android:visibility="@{viewModel.imEncryptionMandatoryAvailable ? View.VISIBLE : View.GONE}"
+                            app:layout_constraintTop_toTopOf="@id/im_encryption_mandatory_switch"
+                            app:layout_constraintBottom_toBottomOf="@id/im_encryption_mandatory_switch"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/im_encryption_mandatory_switch"/>
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/settings_title_style"
+                            android:id="@+id/mwi_uri_title"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="16dp"
+                            android:text="@string/account_settings_mwi_uri_title"
+                            android:maxLines="2"
+                            android:ellipsize="end"
+                            app:layout_constraintTop_toBottomOf="@id/im_encryption_mandatory_switch"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"/>
+
+                        <androidx.appcompat.widget.AppCompatEditText
+                            style="@style/default_text_style"
+                            android:id="@+id/mwi_uri"
+                            android:layout_width="0dp"
+                            android:layout_height="50dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginBottom="20dp"
+                            android:background="@drawable/edit_text_background"
+                            android:paddingStart="20dp"
+                            android:paddingEnd="20dp"
+                            android:text="@={viewModel.voicemailUri}"
+                            android:inputType="text|textUri"
+                            android:hint="@string/account_settings_mwi_uri_title"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/mwi_uri_title"/>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/sip_proxy_title"
-                        android:layout_width="0dp"
+                        style="@style/section_header_style"
+                        android:id="@+id/tunnel"
+                        android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:text="@string/account_settings_sip_proxy_url_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/transport_spinner"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
+                        android:padding="5dp"
+                        android:layout_marginStart="26dp"
+                        android:layout_marginEnd="26dp"
+                        android:layout_marginTop="16dp"
+                        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"/>
 
-                    <androidx.appcompat.widget.AppCompatEditText
-                        style="@style/default_text_style"
-                        android:id="@+id/sip_proxy"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="20dp"
-                        android:text="@={viewModel.sipProxyServer}"
-                        android:inputType="text|textUri"
-                        android:hint="@string/account_settings_sip_proxy_url_title"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/sip_proxy_title"/>
-
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        style="@style/material_switch_style"
-                        android:id="@+id/outbound_proxy_switch"
-                        android:layout_width="wrap_content"
+                    <include
+                        android:id="@+id/account_advanced_settings"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginEnd="16dp"
-                        android:checked="@={viewModel.outboundProxyEnabled}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/sip_proxy" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/outbound_proxy_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/account_settings_outbound_proxy_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toTopOf="@id/outbound_proxy_switch"
-                        app:layout_constraintBottom_toBottomOf="@id/outbound_proxy_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/outbound_proxy_switch"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/stun_server_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
+                        android:layout_marginTop="8dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:text="@string/account_settings_stun_server_url_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/outbound_proxy_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        style="@style/default_text_style"
-                        android:id="@+id/stun_server"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="20dp"
-                        android:text="@={viewModel.stunServer}"
-                        android:inputType="text|textUri"
-                        android:hint="@string/account_settings_stun_server_url_title"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/stun_server_title"/>
-
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        style="@style/material_switch_style"
-                        android:id="@+id/ice_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginEnd="16dp"
-                        android:checked="@={viewModel.iceEnabled}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/stun_server" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/ice_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/account_settings_enable_ice_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toTopOf="@id/ice_switch"
-                        app:layout_constraintBottom_toBottomOf="@id/ice_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/ice_switch"/>
-
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        style="@style/material_switch_style"
-                        android:id="@+id/avpf_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginEnd="16dp"
-                        android:checked="@={viewModel.avpfEnabled}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/ice_switch" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/avpf_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/account_settings_avpf_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toTopOf="@id/avpf_switch"
-                        app:layout_constraintBottom_toBottomOf="@id/avpf_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/avpf_switch"/>
-
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        style="@style/material_switch_style"
-                        android:id="@+id/bundle_mode_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginEnd="16dp"
-                        android:checked="@={viewModel.bundleModeEnabled}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/avpf_switch" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/bundle_mode_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/account_settings_bundle_mode_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toTopOf="@id/bundle_mode_switch"
-                        app:layout_constraintBottom_toBottomOf="@id/bundle_mode_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/bundle_mode_switch"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/mwi_uri_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:text="@string/account_settings_mwi_uri_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/bundle_mode_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        style="@style/default_text_style"
-                        android:id="@+id/mwi_uri"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="20dp"
-                        android:text="@={viewModel.voicemailUri}"
-                        android:inputType="text|textUri"
-                        android:hint="@string/account_settings_mwi_uri_title"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/mwi_uri_title"/>
-
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        style="@style/material_switch_style"
-                        android:id="@+id/cpim_basic_chat_room_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginEnd="16dp"
-                        android:checked="@={viewModel.cpimInBasicChatRooms}"
-                        android:visibility="@{viewModel.imEncryptionMandatory ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/mwi_uri" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/cpim_basic_chat_room_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/account_settings_cpim_in_basic_conversations_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        android:visibility="@{viewModel.imEncryptionMandatory ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintTop_toTopOf="@id/cpim_basic_chat_room_switch"
-                        app:layout_constraintBottom_toBottomOf="@id/cpim_basic_chat_room_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/cpim_basic_chat_room_switch"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/expire_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:text="@string/account_settings_expire_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/cpim_basic_chat_room_switch"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        style="@style/default_text_style"
-                        android:id="@+id/expire"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="20dp"
-                        android:text="@={viewModel.expire}"
-                        android:inputType="number"
-                        android:hint="@string/account_settings_expire_title"
-                        app:layout_constraintVertical_bias="0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/expire_title"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/conference_factory_uri_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:text="@string/account_settings_conference_factory_uri_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/expire"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        style="@style/default_text_style"
-                        android:id="@+id/conference_factory_uri"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="20dp"
-                        android:enabled="@{!viewModel.imEncryptionMandatory}"
-                        android:text="@={viewModel.conferenceFactoryUri}"
-                        android:inputType="text|textUri"
-                        android:hint="@string/account_settings_conference_factory_uri_title"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/conference_factory_uri_title"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/audio_video_conference_factory_uri_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:text="@string/account_settings_audio_video_conference_factory_uri_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/conference_factory_uri"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        style="@style/default_text_style"
-                        android:id="@+id/audio_video_conference_factory_uri"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="20dp"
-                        android:text="@={viewModel.audioVideoConferenceFactoryUri}"
-                        android:inputType="text|textUri"
-                        android:hint="@string/account_settings_audio_video_conference_factory_uri_title"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri_title"/>
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/settings_title_style"
-                        android:id="@+id/lime_server_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:text="@string/account_settings_lime_server_url_title"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        style="@style/default_text_style"
-                        android:id="@+id/lime_server"
-                        android:layout_width="0dp"
-                        android:layout_height="50dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginStart="16dp"
                         android:layout_marginBottom="@dimen/screen_bottom_margin"
-                        android:background="@drawable/edit_text_background"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="20dp"
-                        android:enabled="@{!viewModel.imEncryptionMandatory}"
-                        android:text="@={viewModel.limeServerUrl}"
-                        android:inputType="text|textUri"
-                        android:hint="@string/account_settings_lime_server_url_title"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/lime_server_title"
-                        app:layout_constraintBottom_toBottomOf="parent"/>
+                        android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE}"
+                        layout="@layout/account_advanced_settings"
+                        bind:viewModel="@{viewModel}"/>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
 
             </ScrollView>
 
diff --git a/app/src/main/res/layout/assistant_landing_fragment.xml b/app/src/main/res/layout/assistant_landing_fragment.xml
index 9fdedc43d..c1bc9a9af 100644
--- a/app/src/main/res/layout/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout/assistant_landing_fragment.xml
@@ -22,7 +22,7 @@
             type="View.OnClickListener" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.assistant.viewmodel.LandingViewModel" />
+            type="org.linphone.ui.assistant.viewmodel.AccountLoginViewModel" />
     </data>
 
     <ScrollView
diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml
deleted file mode 100644
index 224ed0ed5..000000000
--- a/app/src/main/res/layout/assistant_login_fragment.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?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">
-
-    <data>
-        <import type="android.view.View" />
-        <import type="android.text.InputType" />
-        <variable
-            name="backClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="forgottenPasswordClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="viewModel"
-            type="org.linphone.ui.assistant.viewmodel.AccountLoginViewModel" />
-    </data>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:background="?attr/color_main2_000">
-
-        <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:padding="15dp"
-                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"/>
-
-            <ImageView
-                android:id="@+id/header"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="19dp"
-                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_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:tint="@color/main1_500"/>
-    
-            <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:layout_marginTop="100dp"
-                android:paddingBottom="27dp"
-                android:text="@string/assistant_account_login"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="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:text="@{@string/sip_address + `*`, default=@string/sip_address}"
-                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/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=`sip:johndoe@sip.linphone.org`}"
-                android:textSize="14sp"
-                android:textColor="?attr/color_main2_600"
-                android:background="@drawable/edit_text_background"
-                android:inputType="text|textNoSuggestions"
-                android:hint="@string/sip_address_hint"
-                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/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:text="@{@string/password + `*`, default=@string/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.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"
-                android:inputType="@{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"/>
-
-            <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/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.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"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </ScrollView>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_secure_mode_fragment.xml b/app/src/main/res/layout/assistant_secure_mode_fragment.xml
deleted file mode 100644
index d68ad4dc2..000000000
--- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?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">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="backClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="defaultModeTooltipClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="interopModeTooltipClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="continueClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="viewModel"
-            type="org.linphone.ui.assistant.viewmodel.AccountLoginViewModel" />
-    </data>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:background="?attr/color_main2_000">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:onClick="@{backClickListener}"
-                android:id="@+id/back"
-                android:visibility="invisible"
-                android:layout_width="@dimen/top_bar_height"
-                android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
-                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"/>
-
-            <ImageView
-                android:id="@+id/header"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="19dp"
-                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_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/sub_title"
-                app:tint="@color/main1_500"/>
-
-            <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:layout_marginTop="100dp"
-                android:text="@string/assistant_account_secure_mode_title"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/sub_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingBottom="25dp"
-                android:text="@string/assistant_account_secure_mode_subtitle"
-                android:textSize="14sp"
-                android:textColor="?attr/color_on_main"
-                app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/default_mode"
-                style="@style/default_text_style_800"
-                android:onClick="@{() -> viewModel.switchToSecureMode()}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:text="@string/manage_account_e2e_encrypted_mode_default_title"
-                android:textSize="16sp"
-                android:textColor="?attr/color_main2_900"
-                android:checked="@{viewModel.isCurrentlySelectedModeSecure}"
-                android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}"
-                app:useMaterialThemeColors="false"
-                app:buttonTint="?attr/color_info_500"
-                app:layout_constraintTop_toBottomOf="@id/sub_title"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <ImageView
-                android:id="@+id/default_mode_tooltip"
-                android:onClick="@{defaultModeTooltipClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/info"
-                android:contentDescription="@string/content_description_click_for_more_info"
-                app:tint="?attr/color_main2_900"
-                app:layout_constraintTop_toTopOf="@id/default_mode"
-                app:layout_constraintBottom_toBottomOf="@id/default_mode"
-                app:layout_constraintStart_toEndOf="@id/default_mode" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/default_mode_summary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/shape_squircle_gray_100_background"
-                android:paddingTop="20dp"
-                android:paddingBottom="20dp"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:text="@string/manage_account_e2e_encrypted_mode_default_summary"
-                android:textSize="14sp"
-                android:gravity="start"
-                android:drawableEnd="@drawable/profile_secure_logo"
-                android:drawablePadding="10dp"
-                app:layout_constraintTop_toBottomOf="@id/default_mode"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/interop_mode"
-                style="@style/default_text_style_800"
-                android:onClick="@{() -> viewModel.switchToInteropMode()}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:text="@string/manage_account_e2e_encrypted_mode_interoperable_title"
-                android:textSize="16sp"
-                android:textColor="?attr/color_main2_900"
-                android:checked="@{!viewModel.isCurrentlySelectedModeSecure}"
-                android:enabled="@{viewModel.isCurrentlySelectedModeSecure}"
-                app:useMaterialThemeColors="false"
-                app:buttonTint="?attr/color_main1_500"
-                app:layout_constraintTop_toBottomOf="@id/default_mode_summary"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <ImageView
-                android:id="@+id/interop_mode_tooltip"
-                android:onClick="@{interopModeTooltipClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/info"
-                android:contentDescription="@string/content_description_click_for_more_info"
-                app:tint="?attr/color_main2_900"
-                app:layout_constraintTop_toTopOf="@id/interop_mode"
-                app:layout_constraintBottom_toBottomOf="@id/interop_mode"
-                app:layout_constraintStart_toEndOf="@id/interop_mode" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/interop_mode_summary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/shape_squircle_gray_100_background"
-                android:paddingTop="20dp"
-                android:paddingBottom="20dp"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:text="@string/manage_account_e2e_encrypted_mode_interoperable_summary"
-                android:textSize="14sp"
-                android:gravity="start"
-                android:drawableEnd="@drawable/profile_interop_logo"
-                android:drawablePadding="10dp"
-                app:layout_constraintTop_toBottomOf="@id/interop_mode"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/primary_button_label_style"
-                android:onClick="@{continueClickListener}"
-                android:id="@+id/login"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/assistant_secure_mode_finish_account_login"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintVertical_bias="1"
-                app:layout_constraintTop_toBottomOf="@id/interop_mode_summary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </ScrollView>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/assistant_nav_graph.xml b/app/src/main/res/navigation/assistant_nav_graph.xml
index d5f86e01c..da7361a12 100644
--- a/app/src/main/res/navigation/assistant_nav_graph.xml
+++ b/app/src/main/res/navigation/assistant_nav_graph.xml
@@ -5,26 +5,6 @@
     android:id="@+id/assistant_nav_graph"
     app:startDestination="@id/landingFragment">
 
-    <fragment
-        android:id="@+id/loginFragment"
-        android:name="org.linphone.ui.assistant.fragment.LoginFragment"
-        android:label="LoginFragment"
-        tools:layout="@layout/assistant_login_fragment" >
-
-        <action
-            android:id="@+id/action_loginFragment_to_profileModeFragment"
-            app:destination="@id/profileModeFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right"
-            app:launchSingleTop="true" />
-        <argument
-            android:name="sipIdentity"
-            app:argType="string" />
-
-    </fragment>
-
     <fragment
         android:id="@+id/registerFragment"
         android:name="org.linphone.ui.assistant.fragment.RegisterFragment"
@@ -68,7 +48,7 @@
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right"
             app:launchSingleTop="true"
-            app:popUpTo="@id/loginFragment"
+            app:popUpTo="@id/landingFragment"
             app:popUpToInclusive="false" />
 
         <action
@@ -79,7 +59,7 @@
             app:launchSingleTop="true"
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right"
-            app:popUpTo="@id/loginFragment"
+            app:popUpTo="@id/landingFragment"
             app:popUpToInclusive="false" />
 
     </fragment>
@@ -89,26 +69,18 @@
         android:name="org.linphone.ui.assistant.fragment.RegisterCodeConfirmationFragment"
         android:label="RegisterCodeConfirmationFragment"
         tools:layout="@layout/assistant_register_confirm_sms_code_fragment" >
-
         <action
-            android:id="@+id/action_registerCodeConfirmationFragment_to_loginFragment"
-            app:destination="@id/loginFragment"
+            android:id="@+id/action_registerCodeConfirmationFragment_to_landingFragment"
+            app:destination="@id/landingFragment"
+            app:launchSingleTop="true"
+            app:popUpTo="@id/landingFragment"
+            app:popUpToInclusive="false"
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/slide_out_left"
-            app:launchSingleTop="true"
             app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right"
-            app:popUpTo="@id/loginFragment"
-            app:popUpToInclusive="false" />
-
+            app:popExitAnim="@anim/slide_out_right"/>
     </fragment>
 
-    <fragment
-        android:id="@+id/profileModeFragment"
-        android:name="org.linphone.ui.assistant.fragment.ProfileModeFragment"
-        android:label="ProfileModeFragment"
-        tools:layout="@layout/assistant_secure_mode_fragment" />
-
     <fragment
         android:id="@+id/permissionsFragment"
         android:name="org.linphone.ui.assistant.fragment.PermissionsFragment"
@@ -163,10 +135,6 @@
             app:popExitAnim="@anim/slide_out_right"
             app:launchSingleTop="true" />
 
-        <action
-            android:id="@+id/action_landingFragment_to_profileModeFragment"
-            app:destination="@id/profileModeFragment" />
-
     </fragment>
 
     <fragment
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3f3a97775..8aa3eb0aa 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -339,7 +339,7 @@
     <string name="account_settings_lime_server_url_title">URL du serveur d\'échange de clés de chiffrement</string>
     <string name="account_settings_bundle_mode_title">Mode "bundle"</string>
     <string name="account_settings_cpim_in_basic_conversations_title">Utiliser CPIM dans les conversations "basiques"</string>
-    <string name="account_settings_mwi_uri_title">URI de la boîte vocale</string>
+    <string name="account_settings_mwi_uri_title">URI du serveur de messagerie vocale</string>
 
     <string name="account_settings_dialog_invalid_password_title">Autentification requise</string>
     <string name="account_settings_dialog_invalid_password_message">La connexion a échoué pour le compte \n%s.\n\nVous pouvez renseigner votre mot de passe à nouveau ou bien vérifier les options de configuration de votre compte.</string>