diff --git a/_mysql.c b/_mysql.c
index 5b81c79d..8d8d26db 100644
--- a/_mysql.c
+++ b/_mysql.c
@@ -615,6 +615,10 @@ _mysql_ConnectionObject_Initialize(
 #define _stringsuck(d,t,s) {t=PyMapping_GetItemString(s,#d);\
         if(t){d=PyString_AsString(t);Py_DECREF(t);}\
         PyErr_Clear();}
+
+#endif
+#if MYSQL_VERSION_ID >= 50600
+    client_flag |= CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
 #endif
 
 	if (ssl) {
@@ -651,6 +655,7 @@ _mysql_ConnectionObject_Initialize(
 				(char *)&timeout);
 	}
 #endif
+
 	if (compress != -1) {
 		mysql_options(&(self->connection), MYSQL_OPT_COMPRESS, 0);
 		client_flag |= CLIENT_COMPRESS;