Account issues after device change

Other ZBD issues: