Client ID logic and label changes