Fixed the way customer identity string is split