diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index 643920cbd48b32d6f8e395b71913a4667acdde3b..6e0e8e6c8cc3422b63b991e535b99ebea0ab01cd 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -259,10 +259,13 @@ static GPtrArray* getNewCredential (GHashTable * properties)
 static void update_credential_cb (GtkWidget *widget, gpointer data UNUSED)
 {
     GtkTreeIter iter;
-    gtk_tree_model_get_iter_from_string ( (GtkTreeModel *) credentialStore, &iter, "0");
-    gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "column"));
-    // g_print ("set password to %s\n", (gchar *) gtk_entry_get_text(GTK_ENTRY(widget)));
-    gtk_list_store_set (GTK_LIST_STORE (credentialStore), &iter, column, (gchar *) gtk_entry_get_text (GTK_ENTRY (widget)), -1);
+
+    if (credentialStore) {
+        gtk_tree_model_get_iter_from_string ( (GtkTreeModel *) credentialStore, &iter, "0");
+        gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "column"));
+        // g_print ("set password to %s\n", (gchar *) gtk_entry_get_text(GTK_ENTRY(widget)));
+        gtk_list_store_set (GTK_LIST_STORE (credentialStore), &iter, column, (gchar *) gtk_entry_get_text (GTK_ENTRY (widget)), -1);
+    }
 }
 
 static GtkWidget* create_basic_tab (account_t **a)