diff --git a/sflphone-client-gnome/src/menus.c b/sflphone-client-gnome/src/menus.c
index 3556b5d4e8b9230a99351310c4d1a266d5d40585..0e7931ab5eec46a19cdf9b945114d96d2d47078a 100644
--- a/sflphone-client-gnome/src/menus.c
+++ b/sflphone-client-gnome/src/menus.c
@@ -250,7 +250,7 @@ call_record ( void * foo UNUSED)
 }
 
     static void
-call_wizard ( void * foo UNUSED)
+call_configuration_assistant ( void * foo UNUSED)
 {
 #if GTK_CHECK_VERSION(2,10,0)
     build_wizard();
@@ -352,17 +352,7 @@ create_call_menu()
     // Separator
     menu_items = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
-
-#if GTK_CHECK_VERSION(2,10,0)
-    menu_items = gtk_image_menu_item_new_with_mnemonic(_("_Account creation wizard"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
-    g_signal_connect_swapped( G_OBJECT( menu_items ) , "activate" , G_CALLBACK( call_wizard  ) , NULL );
-    gtk_widget_show (menu_items);
-    // Separator
-    menu_items = gtk_separator_menu_item_new ();
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
-#endif
-
+    
     // Close menu to minimize the main window to the system tray
     menu_items = gtk_image_menu_item_new_from_stock( GTK_STOCK_CLOSE, get_accel_group());
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
@@ -371,10 +361,6 @@ create_call_menu()
             NULL);
     gtk_widget_show (menu_items);
 
-    // Separator
-    menu_items = gtk_separator_menu_item_new ();
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
-
     // Quit Menu - quit SFLphone
     menu_items = gtk_image_menu_item_new_from_stock( GTK_STOCK_QUIT, get_accel_group());
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
@@ -564,6 +550,13 @@ create_edit_menu()
     menu_items = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
 
+#if GTK_CHECK_VERSION(2,10,0)
+    menu_items = gtk_image_menu_item_new_with_mnemonic(_("_Account creation assistant"));
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
+    g_signal_connect_swapped( G_OBJECT( menu_items ) , "activate" , G_CALLBACK( call_configuration_assistant  ) , NULL );
+    gtk_widget_show (menu_items);
+#endif
+
     menu_items = gtk_menu_item_new_with_mnemonic( _("_Accounts") );
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
     g_signal_connect_swapped (G_OBJECT (menu_items), "activate",