diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
index 4177b8ab2..138636c83 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -207,9 +207,11 @@ namespace Bit.App.Pages
             {
                 var pin = await _deviceActionService.DisplayPromptAync(AppResources.EnterPIN,
                     AppResources.SetPINDescription, null, AppResources.Submit, AppResources.Cancel, true);
-                var masterPassOnRestart = true;
                 if(!string.IsNullOrWhiteSpace(pin))
                 {
+                    var masterPassOnRestart = await _platformUtilsService.ShowDialogAsync(
+                       AppResources.PINRequireMasterPasswordRestart, AppResources.UnlockWithPIN,
+                       AppResources.Yes, AppResources.No);
                     if(masterPassOnRestart)
                     {
                         var encPin = await _cryptoService.EncryptAsync(pin);
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 3a6872353..75aea5d62 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -2985,6 +2985,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to You you want to require unlocking with your master password when the application is restarted?.
+        /// </summary>
+        public static string PINRequireMasterPasswordRestart {
+            get {
+                return ResourceManager.GetString("PINRequireMasterPasswordRestart", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Possible Matching Items.
         /// </summary>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index ddae8f37a..535d60d82 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1573,4 +1573,7 @@
   <data name="ExitConfirmation" xml:space="preserve">
     <value>Are you sure you want to exit Bitwarden?</value>
   </data>
+  <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
+  </data>
 </root>
\ No newline at end of file