diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 6e6b8bb..d08ee4b 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -594,11 +594,22 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
           "talkx.l.google.com:80",
           NULL};
 
+      gchar *extra_certificate_identities[] = {
+          "talk.google.com",
+          NULL};
+
       empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
           NULL, NULL);
 
       empathy_account_settings_set_strv (settings, "fallback-servers",
           fallback_servers);
+
+      if (empathy_account_settings_have_tp_param (settings,
+              "extra-certificate-identities"))
+        {
+          empathy_account_settings_set_strv (settings,
+                  "extra-certificate-identities", extra_certificate_identities);
+        }
     }
   else if (!tp_strdiff (service, "facebook"))
     {
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 0db28d7..4005d27 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -798,6 +798,13 @@ empathy_account_settings_get_tp_param (EmpathyAccountSettings *settings,
   return NULL;
 }
 
+gboolean
+empathy_account_settings_have_tp_param (EmpathyAccountSettings *settings,
+    const gchar *param)
+{
+  return (empathy_account_settings_get_tp_param (settings, param) != NULL);
+}
+
 static void
 account_settings_remove_from_unset (EmpathyAccountSettings *settings,
     const gchar *param)
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index fb2b8f4..25f1d31 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -87,6 +87,10 @@ gboolean empathy_account_settings_has_account (
 TpConnectionManagerParam *empathy_account_settings_get_tp_params (
     EmpathyAccountSettings *settings);
 
+gboolean empathy_account_settings_have_tp_param (
+    EmpathyAccountSettings *settings,
+    const gchar *param);
+
 void empathy_account_settings_unset (EmpathyAccountSettings *settings,
     const gchar *param);
 
