merge
API user token fixed
Add validity check