Profile Integration with Community Builder

Dear Support Team,

I had mistakenly thought that the issue was resolved with the latest release when I updated an (earlier post) yesterday. It turns out that Edit Profile from the toolbar would still open the profile page for ED instead of CB.

How can I make sure only CB profile would be editable but clicking on user avatars within ED would bring users to the ED page with post counts, badges, post headlines, etc.?

Thanks!