Added encoding of servername