diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index d7e7ed1914..663db96e70 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-14  Tambet Ingo  <tambet@gmail.com>
+
+	* src/nm-openvpn-service.c (nm_openvpn_socket_data_cb): Detect private key
+	verification errors too.
+
+	* auth-dialog/main.c (pem_is_encrypted): GIOChannel isn't a GObject, use the
+	correct unreferencing function for it.
+
 2008-08-12  Dan Williams  <dcbw@redhat.com>
 
 	* properties/auth-helpers.c
diff --git a/vpn-daemons/openvpn/auth-dialog/main.c b/vpn-daemons/openvpn/auth-dialog/main.c
index 5de7ff123e..4799467240 100644
--- a/vpn-daemons/openvpn/auth-dialog/main.c
+++ b/vpn-daemons/openvpn/auth-dialog/main.c
@@ -160,7 +160,7 @@ pem_is_encrypted (const char *filename)
 	}
 
 	g_io_channel_shutdown (pem_chan, FALSE, NULL);
-	g_object_unref (pem_chan);
+	g_io_channel_unref (pem_chan);
 	return encrypted;
 }
 
diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service.c b/vpn-daemons/openvpn/src/nm-openvpn-service.c
index 258c18dfed..9d0c7d443b 100644
--- a/vpn-daemons/openvpn/src/nm-openvpn-service.c
+++ b/vpn-daemons/openvpn/src/nm-openvpn-service.c
@@ -323,6 +323,11 @@ nm_openvpn_socket_data_cb (GIOChannel *source, GIOCondition condition, gpointer
 		nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED);
 		nm_openvpn_disconnect_management_socket (plugin);
 		again = FALSE;
+	} else if (strstr (str, "private key password verification failed")) {
+		nm_warning ("Private key verification failed");
+		nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED);
+		nm_openvpn_disconnect_management_socket (plugin);
+		again = FALSE;
 	}
 
  out: