Fix Windows User state

Fixes #8218