Small change on client/server encryption/decryption methods