Improved handling of multiple logins / beacon UUIDs