fixes #2297

Signed-off-by: Suki <suki@missallsunday.com>
Don't create a token on prepareDBSettingContext()
fixes #2298

Signed-off-by: Suki <suki@missallsunday.com>
meh... would be cool if this was a valid way to fix this :P
#2298

Signed-off-by: Suki <suki@missallsunday.com>
Revert "Don't create a token on prepareDBSettingContext()"

This reverts commit 83a9a07fb0c6ee8faaab355a304a2bed38d2e943.

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #2306 from MissAllSunday/stuff

Stuff