diff --git a/lib/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp
index 4aa06560c..8bb8b1bc7 100644
--- a/lib/MySQL_Protocol.cpp
+++ b/lib/MySQL_Protocol.cpp
@@ -2033,7 +2033,7 @@ __do_auth:
 		(*myds)->sess->session_fast_forward=fast_forward;
 		(*myds)->sess->user_max_connections=max_connections;
 	}
-	if (password==NULL) {
+	if (password == NULL) {
 		// this is a workaround for bug #603
 		if (
 			((*myds)->sess->session_type == PROXYSQL_SESSION_ADMIN)
@@ -2100,7 +2100,7 @@ __do_auth:
 						(*myds)->sess->transaction_persistent=transaction_persistent;
 						(*myds)->sess->session_fast_forward=fast_forward;
 						(*myds)->sess->user_max_connections=max_connections;
-						if (strncmp(password,(char *)pass,strlen(password))==0) {
+						if (strcmp(password, (char *) pass) == 0) {
 							if (backend_username) {
 								free(password);
 								password=NULL;
@@ -2159,8 +2159,8 @@ __do_auth:
 						ret=true;
 					}
 				} else { // mysql_clear_password
-					if (strncmp(password,(char *)pass,strlen(password))==0) {
-						ret=true;
+					if (strcmp(password, (char *) pass) == 0) {
+						ret = true;
 					}
 				}
 			} else {