2.16 bug fixes

db prep script is now indempotent, move activation link to preferences table.