diff --git a/sflphone-client-gnome/src/config/accountlistconfigdialog.c b/sflphone-client-gnome/src/config/accountlistconfigdialog.c
index ee3b71adba58ac78017f4987f69c21c9fb72c33d..38d0769301453e846b5f32a07a9099d339f9c6e6 100644
--- a/sflphone-client-gnome/src/config/accountlistconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountlistconfigdialog.c
@@ -39,7 +39,6 @@ GtkListStore * accountStore;
 
 GtkDialog * accountListDialog = NULL;
 
-
 account_t * selectedAccount = NULL;      
 // Account properties
 enum {
@@ -54,9 +53,7 @@ enum {
 /**
  * Fills the treelist with accounts
  */
-	void
-account_list_config_dialog_fill()
-{
+void account_list_config_dialog_fill() {
 
 	if (accountListDialog == NULL) {
 		DEBUG("Dialog is not opened");
@@ -536,7 +533,7 @@ show_account_list_config_dialog(void)
 	gtk_widget_show(status_bar);
 	gtk_box_pack_start(GTK_BOX(accountListDialog->vbox ), status_bar, TRUE, TRUE, 0);
 
-	int number_accounts = account_list_get_size();
+	int number_accounts = account_list_get_registered_accounts ();
 	if (number_accounts) {
 		gchar * message = g_strdup_printf(n_("There is %d active account",
 					"There are %d active accounts", number_accounts),
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 3d2c6fe829c3be7d1ad7ce261d1d8ac8893c5b75..b07af3609ec8171210b5a43ef12aba7e14d79da9 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -327,6 +327,9 @@ accounts_changed_cb (DBusGProxy *proxy UNUSED,
     // Update the status bar in case something happened
     // Should fix ticket #1215
     status_bar_display_account();
+
+	// Update the tooltip on the status icon
+	statusicon_set_tooltip ();
 }
 
 
diff --git a/sflphone-client-gnome/src/statusicon.c b/sflphone-client-gnome/src/statusicon.c
index 7d763d75206ce293f566c911c599d71e6599d2b8..984326b2c754a4b839a3956ff438a25da9c79b30 100644
--- a/sflphone-client-gnome/src/statusicon.c
+++ b/sflphone-client-gnome/src/statusicon.c
@@ -156,15 +156,24 @@ show_status_icon()
 			  G_CALLBACK (menu),
 			  create_menu());			  
 
-  // Add a tooltip to the system tray icon
-  int count = account_list_get_size();
-  gchar *tip =  g_markup_printf_escaped ("%s - %s" , 
-                       _("SFLphone"), 
-                       g_markup_printf_escaped(n_("%i account configured", "%i accounts configured", count),count));
-  gtk_status_icon_set_tooltip( status , tip );
-  g_free(tip);
+  statusicon_set_tooltip ();
 }
 
+void statusicon_set_tooltip () {
+
+	int count;
+	gchar *tip;
+
+	// Add a tooltip to the system tray icon
+	count = account_list_get_registered_accounts ();
+	tip =  g_markup_printf_escaped ("%s - %s" ,
+									_("SFLphone"),
+									g_markup_printf_escaped(n_("%i active account", "%i active accounts", count),count));
+	gtk_status_icon_set_tooltip (status, tip);
+	g_free(tip);
+}
+
+
 void status_tray_icon_blink (gboolean active)
 {
 	// Set a different icon to notify of an event
diff --git a/sflphone-client-gnome/src/statusicon.h b/sflphone-client-gnome/src/statusicon.h
index f976c9ad17e6a70ff689d3172bed05f5d271b71e..29fe256e27ccec19d1fac1013d3a9f5c4fe0dd40 100644
--- a/sflphone-client-gnome/src/statusicon.h
+++ b/sflphone-client-gnome/src/statusicon.h
@@ -85,6 +85,11 @@ void status_tray_icon_blink( gboolean active );
  */
 GtkStatusIcon* get_status_icon( void );
 
+/**
+ * Attach a tooltip to the status icon
+ */
+void statusicon_set_tooltip (void);
+
 #endif // GTK_CHECK_VERSION
 
 #endif