Great point. Easiest solution would be to just separate the Apple ID password and the Device password.