Improve secret token setting.