make hardware keys multiuser compatable

Change-Id: I119a0af6e9e4cdfbea9f3d448e3365eb39dbd28d