diff --git a/security/manager/ssl/OSReauthenticator.cpp b/security/manager/ssl/OSReauthenticator.cpp
index ff980c3d0304..c45da5ba4a1c 100644
--- a/security/manager/ssl/OSReauthenticator.cpp
+++ b/security/manager/ssl/OSReauthenticator.cpp
@@ -156,6 +156,53 @@ bool IsAutoAdminLogonEnabled() {
   return value.Equals(NS_LITERAL_STRING("1"));
 }
 
+bool IsRequireSignonEnabled() {
+  // https://docs.microsoft.com/en-us/windows-hardware/customize/power-settings/no-subgroup-settings-prompt-for-password-on-resume
+  nsresult rv;
+  nsCOMPtr<nsIWindowsRegKey> regKey =
+      do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv);
+  if (NS_FAILED(rv)) {
+    return true;
+  }
+
+  rv = regKey->Open(
+      nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE,
+      NS_LITERAL_STRING("System\\CurrentControlSet\\Control\\Power\\User\\Power"
+                        "Schemes"),
+      nsIWindowsRegKey::ACCESS_READ);
+  if (NS_FAILED(rv)) {
+    return true;
+  }
+
+  nsAutoString activePowerScheme;
+  rv = regKey->ReadStringValue(NS_LITERAL_STRING("ActivePowerScheme"),
+                               activePowerScheme);
+  if (NS_FAILED(rv)) {
+    return true;
+  }
+  regKey->Close();
+
+  rv = regKey->Open(
+      nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE,
+      NS_LITERAL_STRING("System\\CurrentControlSet\\Control\\Power\\User\\Power"
+                        "Schemes\\") +
+          activePowerScheme +
+          NS_LITERAL_STRING("\\0e796bdb-100d-47d6-a2d5-f7d2daa51f51"),
+      nsIWindowsRegKey::ACCESS_READ);
+  if (NS_FAILED(rv)) {
+    return true;
+  }
+
+  uint32_t value;
+  rv = regKey->ReadIntValue(NS_LITERAL_STRING("ACSettingIndex"), &value);
+  if (NS_FAILED(rv)) {
+    return true;
+  }
+  regKey->Close();
+
+  return !!value;
+}
+
 // Use the Windows credential prompt to ask the user to authenticate the
 // currently used account.
 static nsresult ReauthenticateUserWindows(
@@ -164,9 +211,11 @@ static nsresult ReauthenticateUserWindows(
     /* out */ bool& reauthenticated,
     /* inout */ bool& isBlankPassword,
     /* inout */ int64_t& prefLastChanged,
-    /* out */ bool& isAutoAdminLogonEnabled) {
+    /* out */ bool& isAutoAdminLogonEnabled,
+    /* out */ bool& isRequireSignonEnabled) {
   reauthenticated = false;
   isAutoAdminLogonEnabled = false;
+  isRequireSignonEnabled = true;
 
   // Check if the user has a blank password before proceeding
   DWORD usernameLength = CREDUI_MAX_USERNAME_LENGTH + 1;
@@ -230,6 +279,8 @@ static nsresult ReauthenticateUserWindows(
 
   isAutoAdminLogonEnabled = IsAutoAdminLogonEnabled();
 
+  isRequireSignonEnabled = IsRequireSignonEnabled();
+
   // Is used in next iteration if the previous login failed.
   DWORD err = 0;
   std::unique_ptr<char[]> userTokenInfo = GetUserTokenInfo();
@@ -354,12 +405,13 @@ static nsresult ReauthenticateUser(const nsAString& prompt,
                                    /* out */ bool& reauthenticated,
                                    /* inout */ bool& isBlankPassword,
                                    /* inout */ int64_t& prefLastChanged,
-                                   /* out */ bool& isAutoAdminLogonEnabled) {
+                                   /* out */ bool& isAutoAdminLogonEnabled,
+                                   /* out */ bool& isRequireSignonEnabled) {
   reauthenticated = false;
 #if defined(XP_WIN)
-  return ReauthenticateUserWindows(prompt, caption, hwndParent, reauthenticated,
-                                   isBlankPassword, prefLastChanged,
-                                   isAutoAdminLogonEnabled);
+  return ReauthenticateUserWindows(
+      prompt, caption, hwndParent, reauthenticated, isBlankPassword,
+      prefLastChanged, isAutoAdminLogonEnabled, isRequireSignonEnabled);
 #elif defined(XP_MACOSX)
   return ReauthenticateUserMacOS(prompt, reauthenticated, isBlankPassword);
 #endif  // Reauthentication is not implemented for this platform.
@@ -375,9 +427,10 @@ static void BackgroundReauthenticateUser(RefPtr<Promise>& aPromise,
   nsAutoCString recovery;
   bool reauthenticated;
   bool isAutoAdminLogonEnabled;
-  nsresult rv = ReauthenticateUser(aMessageText, aCaptionText, hwndParent,
-                                   reauthenticated, isBlankPassword,
-                                   prefLastChanged, isAutoAdminLogonEnabled);
+  bool isRequireSignonEnabled;
+  nsresult rv = ReauthenticateUser(
+      aMessageText, aCaptionText, hwndParent, reauthenticated, isBlankPassword,
+      prefLastChanged, isAutoAdminLogonEnabled, isRequireSignonEnabled);
 
   nsTArray<int32_t> prefLastChangedUpdates;
 #if defined(XP_WIN)
@@ -396,6 +449,7 @@ static void BackgroundReauthenticateUser(RefPtr<Promise>& aPromise,
   results.AppendElement(isBlankPassword);
 #if defined(XP_WIN)
   results.AppendElement(isAutoAdminLogonEnabled);
+  results.AppendElement(isRequireSignonEnabled);
 #endif
   nsCOMPtr<nsIRunnable> runnable(NS_NewRunnableFunction(
       "BackgroundReauthenticateUserResolve",
diff --git a/toolkit/modules/OSKeyStore.jsm b/toolkit/modules/OSKeyStore.jsm
index 7627bc6f9561..4b9eaa71d875 100644
--- a/toolkit/modules/OSKeyStore.jsm
+++ b/toolkit/modules/OSKeyStore.jsm
@@ -223,6 +223,9 @@ var OSKeyStore = {
               if (reauthResult[2]) {
                 result.auth_details += "_auto_admin_logon";
               }
+              if (!reauthResult[3]) {
+                result.auth_details += "_require_signon_disabled";
+              }
             }
             return result;
           });