diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 82a4c7847..8a8f137bb 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -433,7 +433,7 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
 int
 gw_MySQLWrite_client(DCB *dcb, GWBUF *queue)
 {
-#if 0
+#if 1
 	return dcb_write(dcb, queue);
 #else
 int	w, saved_errno = 0;
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index a1e602083..16e78b92a 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -986,7 +986,7 @@ int gw_send_change_user_to_backend(char *dbname, char *user, uint8_t *passwd, My
 
 	rv = dcb->func.write(dcb, buffer);
 
-	if (rv < 0)
+	if (rv == 0)
 		return 0;
 	else
 		return 1;