Fixing a minor issue with badge activities

We were always adding a badgeactivity row instead of adding them only
when we need to add them. This change will make it so it ensures that
Badge to Activity is 1..1 relationship.