Fixes #3468 - Move token expiry to scope to avoid FK issues