Auto logout after terminal server session is disconnected

I don't know of a way to combine the two logouts, but you could reduce the inactivity timeout on Firepass. Timeouts can be applied to different master groups, so you could put a user at an untrusted machine into a different master group, which has access to the same terminal server. You could then enforce a shorter timeout when the user is at an untrusted machine. A pre-logon sequence and/or an Advanced Session Variable could determine whether the machine is trusted.