Better support for multiple devices per user