Savage Worlds: Careers [UPDATED]

I'm in the early planning stages of a Savage Worlds game set in our modern world. I'm looking at giving each character a Career Bonus that enhances other skills.

Career Bonuses would be a benefit that the player would receive if a task were related to their chosen occupation, but would not help when in combat. So, a Police Officer could receive the bonus when using Investigation or a Merchant could gain the bonus when using Persuasion.

Option 1
   When a character's career comes into play, they gain a +2 to their Skill roll.

Option 2

   When a character's career comes into play, their Wild Die is a d8.

Any feedback is appreciated.