[#33828] Enable / Disable option to force logout functionality (Fix
#3734)