diff -Naur network-manager-applet-0.9.8.8.original/src/applet-agent.c network-manager-applet-0.9.8.8/src/applet-agent.c
--- network-manager-applet-0.9.8.8.original/src/applet-agent.c	2013-11-11 16:41:44.000000000 +0200
+++ network-manager-applet-0.9.8.8/src/applet-agent.c	2014-09-15 15:31:48.434730102 +0300
@@ -41,7 +41,7 @@
 #include "utils.h"
 #include "nma-marshal.h"
 
-#define KEYRING_UUID_TAG "connection-uuid"
+#define KEYRING_ID_TAG "connection-id"
 #define KEYRING_SN_TAG "setting-name"
 #define KEYRING_SK_TAG "setting-key"
 
@@ -49,7 +49,7 @@
 	"org.freedesktop.NetworkManager.Connection",
 	SECRET_SCHEMA_DONT_MATCH_NAME,
 	{
-		{ KEYRING_UUID_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING },
+		{ KEYRING_ID_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING },
 		{ KEYRING_SN_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING },
 		{ KEYRING_SK_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING },
 		{ NULL, 0 },
@@ -450,7 +450,7 @@
 	GError *error = NULL;
 	NMSettingConnection *s_con;
 	NMSetting *setting;
-	const char *uuid, *ctype;
+	const char *id, *ctype;
 	GHashTable *attrs;
 
 	setting = nm_connection_get_setting_by_name (connection, setting_name);
@@ -464,16 +464,16 @@
 		return;
 	}
 
-	uuid = nm_connection_get_uuid (connection);
+	id = nm_connection_get_id (connection);
 
 	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 	ctype = nm_setting_connection_get_connection_type (s_con);
 
-	if (!uuid || !ctype) {
+	if (!id || !ctype) {
 		error = g_error_new (NM_SECRET_AGENT_ERROR,
 		                     NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
-		                     "%s.%d - Connection didn't have required UUID.",
+		                     "%s.%d - Connection didn't have required ID.",
 		                     __FILE__, __LINE__);
 		callback (agent, connection, NULL, error, callback_data);
 		g_error_free (error);
@@ -504,7 +504,7 @@
 	 * later if required.
 	 */
 	attrs = secret_attributes_build (&network_manager_secret_schema,
-	                                 KEYRING_UUID_TAG, uuid,
+	                                 KEYRING_ID_TAG, id,
 	                                 KEYRING_SN_TAG, setting_name,
 	                                 NULL);
 
@@ -585,14 +585,12 @@
                                const char *setting_key,
                                char **out_display_name)
 {
-	const char *connection_id, *connection_uuid;
+	const char *connection_id;
 
 	g_return_val_if_fail (connection != NULL, NULL);
 	g_return_val_if_fail (setting_name != NULL, NULL);
 	g_return_val_if_fail (setting_key != NULL, NULL);
 
-	connection_uuid = nm_connection_get_uuid (connection);
-	g_assert (connection_uuid);
 	connection_id = nm_connection_get_id (connection);
 	g_assert (connection_id);
 
@@ -604,7 +602,7 @@
 	}
 
 	return secret_attributes_build (&network_manager_secret_schema,
-	                                KEYRING_UUID_TAG, connection_uuid,
+	                                KEYRING_ID_TAG, connection_id,
 	                                KEYRING_SN_TAG, setting_name,
 	                                KEYRING_SK_TAG, setting_key,
 	                                NULL);
@@ -777,19 +775,19 @@
 	AppletAgentPrivate *priv = APPLET_AGENT_GET_PRIVATE (agent);
 	Request *r;
 	NMSettingConnection *s_con;
-	const char *uuid;
+	const char *id;
 
 	r = request_new (agent, connection, connection_path, NULL, NULL, FALSE, NULL, NULL, callback, callback_data);
 	g_hash_table_insert (priv->requests, GUINT_TO_POINTER (r->id), r);
 
 	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
-	uuid = nm_setting_connection_get_uuid (s_con);
-	g_assert (uuid);
+	id = nm_setting_connection_get_id (s_con);
+	g_assert (id);
 
 	secret_password_clear (&network_manager_secret_schema, r->cancellable,
 	                       delete_find_items_cb, r,
-	                       KEYRING_UUID_TAG, uuid,
+	                       KEYRING_ID_TAG, id,
 	                       NULL);
 	r->keyring_calls++;
 }
