Make sure options exist after activation

- Avoid extra db query if option doesn't exist
- Make sure the option as saved on activation will contain translated defaults
Merge branch 'master' into Small-fixes