diff --git a/Linphone/view/Page/Form/Login/SIPLoginPage.qml b/Linphone/view/Page/Form/Login/SIPLoginPage.qml
index 956574074..3b0766372 100644
--- a/Linphone/view/Page/Form/Login/SIPLoginPage.qml
+++ b/Linphone/view/Page/Form/Login/SIPLoginPage.qml
@@ -12,6 +12,7 @@ LoginLayout {
 	signal goBack()
 	signal goToRegister()
 	signal connectionSucceed()
+	property bool showBackButton: false
 	
 	titleContent: [
 		RowLayout {
@@ -20,6 +21,7 @@ LoginLayout {
 			spacing: 21 * DefaultStyle.dp
 			Button {
 				id: backButton
+				visible: mainItem.showBackButton 
 				Layout.preferredHeight: 24 * DefaultStyle.dp
 				Layout.preferredWidth: 24 * DefaultStyle.dp
 				icon.source: AppIcons.leftArrow
diff --git a/Linphone/view/Page/Window/Main/MainWindow.qml b/Linphone/view/Page/Window/Main/MainWindow.qml
index 7874188ac..de5870506 100644
--- a/Linphone/view/Page/Window/Main/MainWindow.qml
+++ b/Linphone/view/Page/Window/Main/MainWindow.qml
@@ -169,6 +169,9 @@ AbstractWindow {
 				openMainPage()
 				proposeH264CodecsDownload()
 			}
+			StackView.onActivated:{
+				if (!SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin || accountProxy?.haveAccount) showBackButton = true
+			}
 		}
 	}
 	Component {