diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateMemberSettingsRequest.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateMemberSettingsRequest.cs
index 06967caf1..66c9a5b41 100644
--- a/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateMemberSettingsRequest.cs
+++ b/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateMemberSettingsRequest.cs
@@ -54,5 +54,7 @@ public class UpdateMemberSettingsRequest
         public int PasswordExpiry { get; set; }
 
         public int PasswordExpiryReminder { get; set; }
+
+        public bool ForceLogoutAfterPasswordChanged { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SecurityController.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SecurityController.cs
index 9e6307ac9..b88d0384e 100644
--- a/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SecurityController.cs
+++ b/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SecurityController.cs
@@ -384,7 +384,8 @@ public HttpResponseMessage GetMemberSettings()
                             Host.EnableStrengthMeter,
                             Host.EnableIPChecking,
                             Host.PasswordExpiry,
-                            Host.PasswordExpiryReminder
+                            Host.PasswordExpiryReminder,
+                            ForceLogoutAfterPasswordChanged = HostController.Instance.GetBoolean("ForceLogoutAfterPasswordChanged")
                         }
                     }
                 };
@@ -421,6 +422,7 @@ public HttpResponseMessage UpdateMemberSettings(UpdateMemberSettingsRequest requ
                 HostController.Instance.Update("MembershipDaysBeforePasswordReuse", request.MembershipDaysBeforePasswordReuse.ToString(), false);
                 HostController.Instance.Update("PasswordExpiry", request.PasswordExpiry.ToString());
                 HostController.Instance.Update("PasswordExpiryReminder", request.PasswordExpiryReminder.ToString());
+                HostController.Instance.Update("ForceLogoutAfterPasswordChanged", request.ForceLogoutAfterPasswordChanged ? "Y" : "N", false);
 
                 return Request.CreateResponse(HttpStatusCode.OK, new { Success = true });
             }
diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/src/components/memberManagement/index.jsx b/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/src/components/memberManagement/index.jsx
index 742d08d4e..b090a0826 100644
--- a/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/src/components/memberManagement/index.jsx
+++ b/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/src/components/memberManagement/index.jsx
@@ -264,7 +264,7 @@ class MemberManagementPanelBody extends Component {
                         </div>
                     </InputGroup>
                     <InputGroup>
-                        <div className="memberSettings-row_switch" style={{ margin: "0" }}>
+                        <div className="memberSettings-row_switch" style={{ margin: "0 0 20px 0" }}>
                             <Label
                                 labelType="inline"
                                 tooltipMessage={resx.get("plEnableStrengthMeter.Help") }
@@ -283,7 +283,7 @@ class MemberManagementPanelBody extends Component {
                         </div>
                     </InputGroup>
                     <InputGroup>
-                        <div className="memberSettings-row_switch" style={{ margin: "20px 0 20px 0" }}>
+                        <div className="memberSettings-row_switch" style={{ margin: "0 0 20px 0" }}>
                             <Label
                                 labelType="inline"
                                 tooltipMessage={resx.get("plEnableIPChecking.Help") }
@@ -301,6 +301,25 @@ class MemberManagementPanelBody extends Component {
                                 onChange={this.onSettingChange.bind(this, "EnableIPChecking") } />
                         </div>
                     </InputGroup>
+                    <InputGroup>
+                        <div className="memberSettings-row_switch" style={{ margin: "0 0 20px 0" }}>
+                            <Label
+                                labelType="inline"
+                                tooltipMessage={resx.get("plForceLogOutAfterPasswordChanged.Help") }
+                                label={resx.get("plForceLogOutAfterPasswordChanged") }
+                                extra={
+                                    <Tooltip
+                                        messages={[resx.get("GlobalSetting")]}
+                                        type="global"
+                                        style={{ float: "left", position: "static" }} />
+                                } />
+                            <Switch
+                                onText={resx.get("SwitchOn")}
+                                offText={resx.get("SwitchOff")}
+                                value={state.memberSettings.ForceLogoutAfterPasswordChanged}
+                                onChange={this.onSettingChange.bind(this, "ForceLogoutAfterPasswordChanged") } />
+                        </div>
+                    </InputGroup>
                     <InputGroup>
                         <Label
                             tooltipMessage={resx.get("PasswordConfig_PasswordExpiry.Help") }
@@ -371,4 +390,4 @@ function mapStateToProps(state) {
     };
 }
 
-export default connect(mapStateToProps)(MemberManagementPanelBody);
\ No newline at end of file
+export default connect(mapStateToProps)(MemberManagementPanelBody);
diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx b/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
index d6dc5238c..33fa664c9 100644
--- a/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
+++ b/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
@@ -1156,4 +1156,10 @@
   <data name="Check.Text" xml:space="preserve">
     <value>[ Check ]</value>
   </data>
+  <data name="plForceLogOutAfterPasswordChanged.Text" xml:space="preserve">
+    <value>Force Logout After Password Changed</value>
+  </data>
+  <data name="plForceLogOutAfterPasswordChanged.Help" xml:space="preserve">
+    <value>Force user logout in other browsers after the user's password has been changed.</value>
+  </data>
 </root>