diff --git a/src/devices/nm-device-bt.c b/src/devices/nm-device-bt.c
index e22c96eee3..3e5b693354 100644
--- a/src/devices/nm-device-bt.c
+++ b/src/devices/nm-device-bt.c
@@ -423,7 +423,15 @@ ppp_failed (NMModem *modem, NMDeviceStateReason reason, gpointer user_data)
 static void
 modem_auth_requested (NMModem *modem, gpointer user_data)
 {
-	nm_device_state_changed (NM_DEVICE (user_data),
+	NMDevice *device = NM_DEVICE (user_data);
+
+	/* Auth requests (PIN, PAP/CHAP passwords, etc) only get handled
+	 * during activation.
+	 */
+	if (!nm_device_is_activating (device))
+		return;
+
+	nm_device_state_changed (device,
 	                         NM_DEVICE_STATE_NEED_AUTH,
 	                         NM_DEVICE_STATE_REASON_NONE);
 }
diff --git a/src/devices/nm-device-modem.c b/src/devices/nm-device-modem.c
index 0bed60cd80..e047c03e11 100644
--- a/src/devices/nm-device-modem.c
+++ b/src/devices/nm-device-modem.c
@@ -113,7 +113,15 @@ modem_prepare_result (NMModem *modem,
 static void
 modem_auth_requested (NMModem *modem, gpointer user_data)
 {
-	nm_device_state_changed (NM_DEVICE (user_data),
+	NMDevice *device = NM_DEVICE (user_data);
+
+	/* Auth requests (PIN, PAP/CHAP passwords, etc) only get handled
+	 * during activation.
+	 */
+	if (!nm_device_is_activating (device))
+		return;
+
+	nm_device_state_changed (device,
 	                         NM_DEVICE_STATE_NEED_AUTH,
 	                         NM_DEVICE_STATE_REASON_NONE);
 }