Merge "Revert "Update the enabled state with the current user state"" into main