diff --git a/Linphone/UI/Main/ContentView.swift b/Linphone/UI/Main/ContentView.swift
index c350a78c2..c33812146 100644
--- a/Linphone/UI/Main/ContentView.swift
+++ b/Linphone/UI/Main/ContentView.swift
@@ -460,8 +460,11 @@ struct ContentView: View {
                                                     cachedImage
                                                         .resizable()
                                                         .aspectRatio(contentMode: .fill)
-                                                        .frame(width: avatarSize, height: avatarSize)
-                                                        .clipShape(Circle())
+														.frame(width: avatarSize, height: avatarSize)
+														.clipShape(Circle())
+														.onTapGesture {
+															openMenu()
+														}
                                                 } else {
                                                     ProgressView()
                                                         .frame(width: avatarSize, height: avatarSize)
diff --git a/Linphone/UI/Main/Settings/Fragments/AccountProfileFragment.swift b/Linphone/UI/Main/Settings/Fragments/AccountProfileFragment.swift
index 6f46cab52..3da79fbb4 100644
--- a/Linphone/UI/Main/Settings/Fragments/AccountProfileFragment.swift
+++ b/Linphone/UI/Main/Settings/Fragments/AccountProfileFragment.swift
@@ -641,6 +641,12 @@ struct AccountProfileFragment: View {
 						actionSecondButton: {
 							if accountProfileViewModel.accountModelIndex != nil {
 								CoreContext.shared.accounts[accountProfileViewModel.accountModelIndex!].logout()
+								isShowAccountProfileFragment = false
+								if let firstAccount = CoreContext.shared.accounts.first?.account {
+									CoreContext.shared.doOnCoreQueue { core in
+										core.defaultAccount = firstAccount
+									}
+								}
 							}
 						}
 					)