BuddyPress.org

The second one.

Not sure if this will break any custom functionality that the Church theme uses (custom widgets and the like).

But it will make the BuddyBar show up correctly.