diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
index 52b24f0b24472fc938f8c54bf6f75a803db8ff81..80cdcb928ca3b1a48bdf1bba7568d97dabfbcb1c 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
@@ -213,9 +213,11 @@ public class GeneralAccountFragment extends BasePreferenceFragment<GeneralAccoun
     }
 
     @Override
-    public void addJamiPreferences() {
+    public void addJamiPreferences(String accountId) {
+        PreferenceManager pm = getPreferenceManager();
+        pm.setSharedPreferencesMode(Context.MODE_PRIVATE);
+        pm.setSharedPreferencesName(SharedPreferencesServiceImpl.PREFS_ACCOUNT+accountId);
         addPreferencesFromResource(R.xml.account_prefs_jami);
-
     }
 
     @Override
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java
index ff8b386fc6b6c7f5315899dad624932ba9d36104..1c7f5ccddd15db8478f7db5dd9bf0938e63adee5 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java
@@ -61,7 +61,7 @@ public class GeneralAccountPresenter extends RootPresenter<GeneralAccountView> {
         mAccount = mAccountService.getAccount(accountId);
         if (mAccount != null) {
             if (mAccount.isRing()) {
-                getView().addJamiPreferences();
+                getView().addJamiPreferences(mAccount.getAccountID());
             } else {
                 getView().addSipPreferences();
             }
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java
index e1fe863845c055a76c348f434be19c146de39856..f0825873f6f5289aaba4efe642ed58b182a900e9 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java
@@ -25,7 +25,7 @@ import cx.ring.model.Account;
 
 public interface GeneralAccountView {
 
-    void addJamiPreferences();
+    void addJamiPreferences(String accountId);
 
     void addSipPreferences();
 
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java
index 18321675faf10af5bec657641a24d2d54c75f7d9..5dd1d350dc0fc5fb70b1c810e68e3861ca1d3626 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java
@@ -77,7 +77,7 @@ public class TVSettingsFragment extends LeanbackSettingsFragmentCompat {
         }
 
         @Override
-        public void addJamiPreferences() {
+        public void addJamiPreferences(String acccouontId) {
 
         }