Improve validation of TOKEN and USER vars