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