added spec and only set server_token if nil