diff --git a/jami-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt
index a04b3fc1d2407208aafa7d8fb8ba4d4a4a4bb6ce..21ad6ce9e98c449e2bf68acdff2c8d387dbef259 100644
--- a/jami-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt
+++ b/jami-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt
@@ -149,7 +149,7 @@ class AdvancedAccountFragment : BasePreferenceFragment<AdvancedAccountPresenter>
             }
             is PasswordPreference -> {
                 presenter.passwordPreferenceChanged(key, newValue)
-                preference.setSummary(if (TextUtils.isEmpty(newValue.toString())) "" else "******")
+                preference.setSummary(if (TextUtils.isEmpty(newValue.toString())) "" else "••••••")
             }
             else -> {
                 presenter.preferenceChanged(key, newValue)
diff --git a/jami-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt
index a65e6b8afd5ab2a3a3e8dc6a3014e270fb4f971c..0a58c66802e3deeb804e88e68b9d5bbdac58c754 100644
--- a/jami-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt
+++ b/jami-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt
@@ -50,18 +50,12 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>()
         false
     }
     private val changeBasicPreferenceListener = Preference.OnPreferenceChangeListener { preference: Preference, newValue: Any ->
-        Log.i(TAG, "Changing preference " + preference.key + " to value:" + newValue)
+        Log.i(TAG, "Changing preference ${preference.key} type ${preference.javaClass.simpleName} to value:$newValue")
         val key = fromString(preference.key) ?: return@OnPreferenceChangeListener false
         if (preference is TwoStatePreference) {
             presenter.twoStatePreferenceChanged(key, newValue)
         } else if (preference is PasswordPreference) {
-            val tmp = StringBuilder()
-            var i = 0
-            while (i < (newValue as String).length) {
-                tmp.append("*")
-                ++i
-            }
-            preference.setSummary(tmp.toString())
+            preference.setSummary((newValue as CharSequence).map { "•" }.joinToString(""))
             presenter.passwordPreferenceChanged(key, newValue)
         } else if (key === ConfigKey.ACCOUNT_USERNAME) {
             presenter.userNameChanged(key, newValue)
@@ -173,11 +167,7 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>()
                 val value = details[confKey]
                 (pref as EditTextPreference).text = value
                 if (pref is PasswordPreference) {
-                    val tmp = StringBuilder()
-                    for (i in value.indices) {
-                        tmp.append("*")
-                    }
-                    pref.setSummary(tmp.toString())
+                    pref.setSummary(value.map { "•" }.joinToString(""))
                 } else {
                     pref.setSummary(value)
                 }
@@ -222,12 +212,8 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>()
     companion object {
         val TAG = GeneralAccountFragment::class.simpleName!!
         private const val DIALOG_FRAGMENT_TAG = "androidx.preference.PreferenceFragment.DIALOG"
-        fun newInstance(accountId: String): GeneralAccountFragment {
-            val bundle = Bundle()
-            bundle.putString(AccountEditionFragment.ACCOUNT_ID_KEY, accountId)
-            val generalAccountFragment = GeneralAccountFragment()
-            generalAccountFragment.arguments = bundle
-            return generalAccountFragment
+        fun newInstance(accountId: String) = GeneralAccountFragment().apply {
+            arguments = Bundle().apply { putString(AccountEditionFragment.ACCOUNT_ID_KEY, accountId) }
         }
     }
 }
\ No newline at end of file