diff --git a/CHANGES.md b/CHANGES.md
index 5b250bcf1a..05e01d433e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Add Setting Item to Change PIN (#2462)
 
 Bugfix 🐛:
  - Double bottomsheet effect after verify with passphrase
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
index b6e238c2dc..378c7b853d 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -56,6 +56,7 @@ class PinFragment @Inject constructor(
         when (fragmentArgs.pinMode) {
             PinMode.CREATE -> showCreateFragment()
             PinMode.AUTH   -> showAuthFragment()
+            PinMode.MODIFY -> showCreateFragment() // No need to create another function for now because texts are generic
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinMode.kt b/vector/src/main/java/im/vector/app/features/pin/PinMode.kt
index c24ac5adf2..9801912bd6 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinMode.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinMode.kt
@@ -18,5 +18,6 @@ package im.vector.app.features.pin
 
 enum class PinMode {
     CREATE,
-    AUTH
+    AUTH,
+    MODIFY
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 5872c1fa1c..9d6ed0246c 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -165,6 +165,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         // Security
         const val SETTINGS_SECURITY_USE_FLAG_SECURE = "SETTINGS_SECURITY_USE_FLAG_SECURE"
         const val SETTINGS_SECURITY_USE_PIN_CODE_FLAG = "SETTINGS_SECURITY_USE_PIN_CODE_FLAG"
+        const val SETTINGS_SECURITY_CHANGE_PIN_CODE_FLAG = "SETTINGS_SECURITY_CHANGE_PIN_CODE_FLAG"
         private const val SETTINGS_SECURITY_USE_BIOMETRICS_FLAG = "SETTINGS_SECURITY_USE_BIOMETRICS_FLAG"
         private const val SETTINGS_SECURITY_USE_GRACE_PERIOD_FLAG = "SETTINGS_SECURITY_USE_GRACE_PERIOD_FLAG"
         const val SETTINGS_SECURITY_USE_COMPLETE_NOTIFICATIONS_FLAG = "SETTINGS_SECURITY_USE_COMPLETE_NOTIFICATIONS_FLAG"
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
index 37465258f6..1a04dab950 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
@@ -21,6 +21,7 @@ import androidx.preference.Preference
 import androidx.preference.SwitchPreference
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.preference.VectorPreference
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.pin.PinCodeStore
@@ -41,6 +42,10 @@ class VectorSettingsPinFragment @Inject constructor(
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SECURITY_USE_PIN_CODE_FLAG)!!
     }
 
+    private val changePinCodePref by lazy {
+        findPreference<VectorPreference>(VectorPreferences.SETTINGS_SECURITY_CHANGE_PIN_CODE_FLAG)!!
+    }
+
     private val useCompleteNotificationPref by lazy {
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SECURITY_USE_COMPLETE_NOTIFICATIONS_FLAG)!!
     }
@@ -74,6 +79,17 @@ class VectorSettingsPinFragment @Inject constructor(
                 }
                 true
             }
+
+            changePinCodePref.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                if (hasPinCode) {
+                    navigator.openPinCode(
+                            requireContext(),
+                            pinActivityResultLauncher,
+                            PinMode.MODIFY
+                    )
+                }
+                true
+            }
         }
     }
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 2cb6eb9af9..5ef3e7e243 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2686,6 +2686,8 @@
     <string name="settings_security_pin_code_grace_period_title">Require PIN after 2 minutes</string>
     <string name="settings_security_pin_code_grace_period_summary_on">PIN code is required after 2 minutes of not using Element.</string>
     <string name="settings_security_pin_code_grace_period_summary_off">PIN code is required every time you open Element.</string>
+    <string name="settings_security_pin_code_change_pin_title">Change PIN</string>
+    <string name="settings_security_pin_code_change_pin_summary">Change your current PIN</string>
     <string name="auth_pin_confirm_to_disable_title">Confirm PIN to disable PIN</string>
     <string name="error_opening_banned_room">Can\'t open a room where you are banned from.</string>
     <string name="room_error_not_found">Can\'t find this room. Make sure it exists.</string>
diff --git a/vector/src/main/res/xml/vector_settings_pin.xml b/vector/src/main/res/xml/vector_settings_pin.xml
index 27eb275b09..20e240ee35 100644
--- a/vector/src/main/res/xml/vector_settings_pin.xml
+++ b/vector/src/main/res/xml/vector_settings_pin.xml
@@ -7,6 +7,12 @@
         android:summary="@string/settings_security_pin_code_summary"
         android:title="@string/settings_security_pin_code_title" />
 
+    <im.vector.app.core.preference.VectorPreference
+        android:dependency="SETTINGS_SECURITY_USE_PIN_CODE_FLAG"
+        android:key="SETTINGS_SECURITY_CHANGE_PIN_CODE_FLAG"
+        android:summary="@string/settings_security_pin_code_change_pin_summary"
+        android:title="@string/settings_security_pin_code_change_pin_title" />
+
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="true"
         android:dependency="SETTINGS_SECURITY_USE_PIN_CODE_FLAG"