More password/token quoting