I have the same exact issue, though I'm fairly sure I didn't have the problem with Windows 8.
I haven't had time to mess around with it, but the only "fixes" I found online required registry edits and, while that isn't hard, there's gotta be a better way... Especially with the heavy push for PIN use in W10...