diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
index 7212f5c08..0643ae4d2 100644
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
@@ -86,11 +86,12 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
             ) {
             if (cfg == proxyConfigToCheck) {
                 Log.i("[Assistant] [Account Login] Registration state is $state: $message")
-                waitForServerAnswer.value = false
                 if (state == RegistrationState.Ok) {
+                    waitForServerAnswer.value = false
                     leaveAssistantEvent.value = Event(true)
                     core.removeListener(this)
                 } else if (state == RegistrationState.Failed) {
+                    waitForServerAnswer.value = false
                     invalidCredentialsEvent.value = Event(true)
                     core.removeListener(this)
                 }
diff --git a/app/src/main/res/anim/enter_left.xml b/app/src/main/res/anim/enter_left.xml
new file mode 100644
index 000000000..0826b75d8
--- /dev/null
+++ b/app/src/main/res/anim/enter_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:fromXDelta="-100%p" android:toXDelta="0%"
+        android:fromYDelta="0%" android:toYDelta="0%"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
diff --git a/app/src/main/res/anim/enter_right.xml b/app/src/main/res/anim/enter_right.xml
new file mode 100644
index 000000000..d424f42c5
--- /dev/null
+++ b/app/src/main/res/anim/enter_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:fromXDelta="100%p" android:toXDelta="0%"
+        android:fromYDelta="0%" android:toYDelta="0%"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>
diff --git a/app/src/main/res/anim/exit_left.xml b/app/src/main/res/anim/exit_left.xml
new file mode 100644
index 000000000..9c2ad0505
--- /dev/null
+++ b/app/src/main/res/anim/exit_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:fromXDelta="0%" android:toXDelta="-100%p"
+        android:fromYDelta="0%" android:toYDelta="0%"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
diff --git a/app/src/main/res/anim/exit_right.xml b/app/src/main/res/anim/exit_right.xml
new file mode 100644
index 000000000..7becffdd5
--- /dev/null
+++ b/app/src/main/res/anim/exit_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:fromXDelta="0%" android:toXDelta="100%p"
+        android:fromYDelta="0%" android:toYDelta="0%"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
index ba6068643..9fdbb5844 100644
--- a/app/src/main/res/navigation/main_nav_graph.xml
+++ b/app/src/main/res/navigation/main_nav_graph.xml
@@ -12,16 +12,22 @@
         tools:layout="@layout/chat_room_master_fragment" >
         <action
             android:id="@+id/action_masterChatRoomsFragment_to_dialerFragment"
+            app:enterAnim="@anim/enter_left"
+            app:exitAnim="@anim/exit_right"
             app:destination="@id/dialerFragment"
             app:popUpTo="@+id/dialerFragment"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_masterChatRoomsFragment_to_masterCallLogsFragment"
+            app:enterAnim="@anim/enter_left"
+            app:exitAnim="@anim/exit_right"
             app:destination="@id/masterCallLogsFragment"
             app:popUpTo="@+id/masterCallLogsFragment"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_masterChatRoomsFragment_to_masterContactsFragment"
+            app:enterAnim="@anim/enter_left"
+            app:exitAnim="@anim/exit_right"
             app:destination="@id/masterContactsFragment"
             app:popUpTo="@+id/masterContactsFragment"
             app:popUpToInclusive="true" />
@@ -56,16 +62,22 @@
         tools:layout="@layout/contact_master_fragment" >
         <action
             android:id="@+id/action_masterContactsFragment_to_masterCallLogsFragment"
+            app:enterAnim="@anim/enter_left"
+            app:exitAnim="@anim/exit_right"
             app:destination="@id/masterCallLogsFragment"
             app:popUpTo="@+id/masterCallLogsFragment"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_masterContactsFragment_to_dialerFragment"
+            app:enterAnim="@anim/enter_right"
+            app:exitAnim="@anim/exit_left"
             app:destination="@id/dialerFragment"
             app:popUpTo="@+id/dialerFragment"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_masterContactsFragment_to_masterChatRoomsFragment"
+            app:enterAnim="@anim/enter_right"
+            app:exitAnim="@anim/exit_left"
             app:destination="@id/masterChatRoomsFragment"
             app:popUpTo="@+id/masterChatRoomsFragment"
             app:popUpToInclusive="true" />
@@ -102,16 +114,22 @@
         tools:layout="@layout/history_master_fragment" >
         <action
             android:id="@+id/action_masterCallLogsFragment_to_dialerFragment"
+            app:enterAnim="@anim/enter_right"
+            app:exitAnim="@anim/exit_left"
             app:destination="@id/dialerFragment"
             app:popUpTo="@+id/dialerFragment"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_masterCallLogsFragment_to_masterContactsFragment"
+            app:enterAnim="@anim/enter_right"
+            app:exitAnim="@anim/exit_left"
             app:destination="@id/masterContactsFragment"
             app:popUpTo="@+id/masterContactsFragment"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_masterCallLogsFragment_to_masterChatRoomsFragment"
+            app:enterAnim="@anim/enter_right"
+            app:exitAnim="@anim/exit_left"
             app:destination="@id/masterChatRoomsFragment"
             app:popUpTo="@+id/masterChatRoomsFragment"
             app:popUpToInclusive="true" />
@@ -126,16 +144,22 @@
         tools:layout="@layout/dialer_fragment" >
         <action
             android:id="@+id/action_dialerFragment_to_masterCallLogsFragment"
+            app:enterAnim="@anim/enter_left"
+            app:exitAnim="@anim/exit_right"
             app:destination="@id/masterCallLogsFragment"
             app:popUpTo="@id/masterCallLogsFragment"
             app:popUpToInclusive="true"/>
         <action
             android:id="@+id/action_dialerFragment_to_masterContactsFragment"
+            app:enterAnim="@anim/enter_left"
+            app:exitAnim="@anim/exit_right"
             app:destination="@id/masterContactsFragment"
             app:popUpTo="@+id/masterContactsFragment"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_dialerFragment_to_masterChatRoomsFragment"
+            app:enterAnim="@anim/enter_right"
+            app:exitAnim="@anim/exit_left"
             app:destination="@id/masterChatRoomsFragment"
             app:popUpTo="@+id/masterChatRoomsFragment"
             app:popUpToInclusive="true" />