Use TOKEN instead of PASSWORD
Only set var if not null