diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 1cad4d868eef52b2b48a03a51545f747cf7535c8..d89d4c89895c48014550940f31364e0f0dd7099f 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -248,12 +248,8 @@ sflphone_fill_account_list(gboolean toolbarInitialized)
         a->protocol_state_description = g_hash_table_lookup(details, REGISTRATION_STATE_DESCRIPTION);
     }
 
-	// Reset the current account message number
+	// Set the current account message number
 	current_account_set_message_number (count);
-
-    // Prevent update being called when toolbar is not yet initialized
-    if(toolbarInitialized)
-        update_actions ();
 }
 
 gboolean sflphone_init()
diff --git a/sflphone-client-gnome/src/actions.h b/sflphone-client-gnome/src/actions.h
index 2365243748bf9792fe31051dd71f68446d897160..41e3ab2ef244812b2e8e044dde175b56ac0849ce 100644
--- a/sflphone-client-gnome/src/actions.h
+++ b/sflphone-client-gnome/src/actions.h
@@ -164,7 +164,7 @@ void sflphone_get_ip2ip_properties (GHashTable **properties);
 /**
  * Initialize the accounts data structure
  */
-void sflphone_fill_account_list(gboolean toolbarInitialized);
+void sflphone_fill_account_list ();
 
 void sflphone_fill_call_list (void);
 
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index ed2e4b140d04b6537f97490ecd280f88b4410e4d..4cd91db08037968747aeca10ebe74c9a0ae971f1 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -320,7 +320,7 @@ accounts_changed_cb (DBusGProxy *proxy UNUSED,
         void * foo  UNUSED )
 {
     DEBUG ("Accounts changed");
-    sflphone_fill_account_list(TRUE);
+    sflphone_fill_account_list ();
     sflphone_fill_ip2ip_profile();
     account_list_config_dialog_fill();
 
diff --git a/sflphone-client-gnome/src/main.c b/sflphone-client-gnome/src/main.c
index f7a8cecd8e219e25fa532817aab25ce1c02de275..2a8b7ca5a9af5e5f43a1392be2a37def3dbfec23 100644
--- a/sflphone-client-gnome/src/main.c
+++ b/sflphone-client-gnome/src/main.c
@@ -116,6 +116,9 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
     // Get the active calls and conferences at startup    
     sflphone_fill_call_list ();
     sflphone_fill_conference_list();
+
+	// Update the GUI
+	update_actions ();
         
     /* start the main loop */
     gtk_main();