diff --git a/src/modems/hayes.c b/src/modems/hayes.c
index 340acb4..a26b371 100644
--- a/src/modems/hayes.c
+++ b/src/modems/hayes.c
@@ -1782,8 +1782,8 @@ static char * _request_attention_sim_pin(Hayes * hayes, HayesChannel * channel,
 		hayes->helper->error(NULL, strerror(errno), 1);
 		return NULL;
 	}
-	format = (channel->quirks & HAYES_QUIRK_CPIN_QUOTES) ? "%s\"%s\""
-		: "%s%s";
+	format = (channel->quirks & HAYES_QUIRK_CPIN_NO_QUOTES) ? "%s%s"
+		: "%s\"%s\"";
 	snprintf(ret, len, format, cmd, password);
 	return ret;
 }
@@ -1804,8 +1804,8 @@ static char * _request_attention_sim_puk(Hayes * hayes, HayesChannel * channel,
 		hayes->helper->error(NULL, strerror(errno), 1);
 		return NULL;
 	}
-	format = (channel->quirks & HAYES_QUIRK_CPIN_QUOTES) ? "%s\"%s\","
-		: "%s%s,";
+	format = (channel->quirks & HAYES_QUIRK_CPIN_NO_QUOTES) ? "%s%s,"
+		: "%s\"%s\",";
 	snprintf(ret, len, format, cmd, password);
 	return ret;
 }
diff --git a/src/modems/hayes/quirks.c b/src/modems/hayes/quirks.c
index 8bf241f..e5c5176 100644
--- a/src/modems/hayes/quirks.c
+++ b/src/modems/hayes/quirks.c
@@ -25,18 +25,18 @@
 HayesQuirks hayes_quirks[] =
 {
 	{ "\"Neo1973 Embedded GSM Modem\"",
-		HAYES_QUIRK_CPIN_QUOTES | HAYES_QUIRK_WANT_SMSC_IN_PDU
+		HAYES_QUIRK_WANT_SMSC_IN_PDU
 			| HAYES_QUIRK_CONNECTED_LINE_DISABLED
 			| HAYES_QUIRK_REPEAT_ON_UNKNOWN_ERROR		},
 	{ "\"Neo1973 GTA01/GTA02 Embedded GSM Modem\"",
-		HAYES_QUIRK_CPIN_QUOTES | HAYES_QUIRK_WANT_SMSC_IN_PDU
+		HAYES_QUIRK_WANT_SMSC_IN_PDU
 			| HAYES_QUIRK_CONNECTED_LINE_DISABLED
 			| HAYES_QUIRK_REPEAT_ON_UNKNOWN_ERROR		},
 	{ "\"Neo1973 GTA02 Embedded GSM Modem\"",
-		HAYES_QUIRK_CPIN_QUOTES | HAYES_QUIRK_WANT_SMSC_IN_PDU
+		HAYES_QUIRK_WANT_SMSC_IN_PDU
 			| HAYES_QUIRK_CONNECTED_LINE_DISABLED
 			| HAYES_QUIRK_REPEAT_ON_UNKNOWN_ERROR		},
 	{ "Nokia N900",
-		HAYES_QUIRK_CPIN_QUOTES | HAYES_QUIRK_BATTERY_70	},
+		HAYES_QUIRK_BATTERY_70					},
 	{ NULL,	0							}
 };
diff --git a/src/modems/hayes/quirks.h b/src/modems/hayes/quirks.h
index 67ede00..07e6597 100644
--- a/src/modems/hayes/quirks.h
+++ b/src/modems/hayes/quirks.h
@@ -25,7 +25,7 @@
 typedef enum _HayesQuirk
 {
 	HAYES_QUIRK_BATTERY_70			= 0x1,
-	HAYES_QUIRK_CPIN_QUOTES			= 0x2,
+	HAYES_QUIRK_CPIN_NO_QUOTES		= 0x2,
 	HAYES_QUIRK_CONNECTED_LINE_DISABLED	= 0x4,
 	HAYES_QUIRK_WANT_SMSC_IN_PDU		= 0x8,
 	HAYES_QUIRK_REPEAT_ON_UNKNOWN_ERROR	= 0x10