diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
index 776ff9ae1b6386563550abb537242adb862b9fd1..ad3821779d118a5a1753464ad85ed3f4ce51a17b 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
@@ -53,12 +53,16 @@ public class TVAccountExport extends JamiGuidedStepFragment<JamiAccountSummaryPr
         implements JamiAccountSummaryView {
 
     private static final long PASSWORD = 1L;
+    private static final long ACTION = 2L;
+
     private ProgressDialog mWaitDialog;
     private String mIdAccount;
+    private boolean mHasPassword;
 
-    public static TVAccountExport createInstance(String idAccount) {
+    public static TVAccountExport createInstance(String idAccount, boolean hasPassword) {
         TVAccountExport fragment = new TVAccountExport();
         fragment.mIdAccount = idAccount;
+        fragment.mHasPassword = hasPassword;
         return fragment;
     }
 
@@ -82,7 +86,16 @@ public class TVAccountExport extends JamiGuidedStepFragment<JamiAccountSummaryPr
 
     @Override
     public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
-        addPasswordAction(getActivity(), actions, PASSWORD, getString(R.string.account_enter_password), "", "");
+        if (mHasPassword) {
+            addPasswordAction(getActivity(), actions, PASSWORD, getString(R.string.account_enter_password), "", "");
+        } else {
+            addAction(getContext(), actions, ACTION, R.string.account_start_export_button);
+        }
+    }
+
+    @Override
+    public void onGuidedActionClicked(GuidedAction action) {
+        presenter.startAccountExport("");
     }
 
     @Override
diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java b/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java
index ef44df80abb77a5267bc24f1a31f5e4141bba5b6..edcb09ff98480fe1aa4973275dd2f990e3f6934e 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java
@@ -418,8 +418,8 @@ public class MainFragment extends BaseBrowseFragment<MainPresenter> implements M
     }
 
     @Override
-    public void showExportDialog(String pAccountID) {
-        GuidedStepSupportFragment wizard = TVAccountExport.createInstance(pAccountID);
+    public void showExportDialog(String pAccountID, boolean hasPassword) {
+        GuidedStepSupportFragment wizard = TVAccountExport.createInstance(pAccountID, hasPassword);
         GuidedStepSupportFragment.add(getParentFragmentManager(), wizard, R.id.main_browse_fragment);
     }
 
diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java b/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java
index a4ce134b745f73a65e616c8ff7050b29c43bdfa8..b42421a6c71e7e54ec51355af362dc4ccdee72ec 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java
@@ -113,7 +113,7 @@ public class MainPresenter extends RootPresenter<MainView> {
     }
 
     public void onExportClicked() {
-        getView().showExportDialog(mAccountService.getCurrentAccount().getAccountID());
+        getView().showExportDialog(mAccountService.getCurrentAccount().getAccountID(), mAccountService.getCurrentAccount().hasPassword());
     }
 
     public void onLicenceClicked(int aboutType) {
diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java b/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java
index 519686f66f2fc62c50280a809e7b0aeb6015d8fe..596f3e0d7dd6b2af7dd4fddaaa65cb5d60234762 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java
@@ -43,7 +43,7 @@ public interface MainView {
     void displayAccountInfos(HomeNavigationViewModel viewModel);
     void updateModel(Account account);
 
-    void showExportDialog(String pAccountID);
+    void showExportDialog(String pAccountID, boolean hasPassword);
 
     void showProfileEditing();