Merge change Ic29d3eac into eclair

* changes:
  Server validates even though server address is wrong DO NOT MERGE