diff --git a/sflphone-client-gnome/src/Makefile.am b/sflphone-client-gnome/src/Makefile.am
index a63c7db317bdc69da66b9d9e6048634e889accab..80a6165a815494b99a923f4f9129b784f4e573a3 100644
--- a/sflphone-client-gnome/src/Makefile.am
+++ b/sflphone-client-gnome/src/Makefile.am
@@ -13,7 +13,6 @@ sflphone_client_gnome_SOURCES = \
   main.c \
   errors.c \
   sflnotify.c \
-  assistant.c \
   mainwindow.c \
   dialpad.c \
   menus.c \
@@ -27,7 +26,7 @@ sflphone_client_gnome_SOURCES = \
   reqaccount.c
 
 noinst_HEADERS =  actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
-                  assistant.h reqaccount.h errors.h sflphone_const.h \
+                  reqaccount.h errors.h sflphone_const.h \
                   menus.h accountlist.h sliders.h statusicon.h callable_obj.h toolbar.h
 
 
diff --git a/sflphone-client-gnome/src/config/Makefile.am b/sflphone-client-gnome/src/config/Makefile.am
index 2c7f3e7b613c99e0470382f03e1ee45ffd6b51be..3a4f01d7d7c5047c27768e044030ded027e5577e 100644
--- a/sflphone-client-gnome/src/config/Makefile.am
+++ b/sflphone-client-gnome/src/config/Makefile.am
@@ -4,11 +4,12 @@ noinst_LTLIBRARIES = libconfig.la
 
 libconfig_la_SOURCES = \
   addressbook-config.c \
+  assistant.c \
   preferencesdialog.c \
   accountlistconfigdialog.c \
   zrtpadvanceddialog.c \
   tlsadvanceddialog.c \
-  accountwindow.c \
+  accountconfigdialog.c \
   hooks-config.c \
   audioconf.c \
   utils.c 
diff --git a/sflphone-client-gnome/src/config/accountwindow.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
similarity index 99%
rename from sflphone-client-gnome/src/config/accountwindow.c
rename to sflphone-client-gnome/src/config/accountconfigdialog.c
index e54593ce4b1ea7653d383adc65fe4154007be83d..6f82997a9a217f146cc0a9861d25540e7d3e1753 100644
--- a/sflphone-client-gnome/src/config/accountwindow.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -22,7 +22,7 @@
 #include <actions.h>
 #include <mainwindow.h>
 #include <accountlist.h>
-#include <accountwindow.h>
+#include <accountconfigdialog.h>
 #include <zrtpadvanceddialog.h>
 #include <tlsadvanceddialog.h>
 
@@ -698,7 +698,7 @@ GtkWidget * create_advanced_tab(account_t **a)
 	gtk_container_set_border_width (GTK_CONTAINER(table), 10);
 	gtk_table_set_row_spacings( GTK_TABLE(table), 5);	
 
-	label = gtk_label_new_with_mnemonic (_("Local port"));
+	label = gtk_label_new_with_mnemonic (_("Registration expire"));
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     expireSpinBox = gtk_spin_button_new_with_range(1, 65535, 1);
diff --git a/sflphone-client-gnome/src/config/accountwindow.h b/sflphone-client-gnome/src/config/accountconfigdialog.h
similarity index 97%
rename from sflphone-client-gnome/src/config/accountwindow.h
rename to sflphone-client-gnome/src/config/accountconfigdialog.h
index 50e6f760f65213b69f56b26f2d5507dc580c29fe..5e6d9132c50ee240aa51122114ace4ea76bda300 100644
--- a/sflphone-client-gnome/src/config/accountwindow.h
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.h
@@ -20,7 +20,7 @@
  
 #ifndef __ACCOUNTWINDOW_H__
 #define __ACCOUNTWINDOW_H__
-/** @file accountwindow.h
+/** @file accountconfigdialog.h
   * @brief The window to edit account details.
   */
 
diff --git a/sflphone-client-gnome/src/assistant.c b/sflphone-client-gnome/src/config/assistant.c
similarity index 98%
rename from sflphone-client-gnome/src/assistant.c
rename to sflphone-client-gnome/src/config/assistant.c
index f7c979c07caf22518ed12bf4a40d0c05bbb66b14..fb7a75e6c8171b36cb64a7a95957018bf2ae3930 100644
--- a/sflphone-client-gnome/src/assistant.c
+++ b/sflphone-client-gnome/src/config/assistant.c
@@ -197,9 +197,15 @@ void build_wizard( void ) {
 
 	wiz = ( struct _wizard* )g_malloc( sizeof( struct _wizard));
 	current = g_new0(account_t, 1);
-	current->properties = g_hash_table_new(NULL, g_str_equal);
+	current->properties = NULL;
+	current->properties = dbus_account_details(NULL);	
+	if (current->properties == NULL) {
+	    DEBUG("Failed to get default values. Creating from scratch");
+	    current->properties = g_hash_table_new(NULL, g_str_equal);
+	}
+    current->accountID = "new";
 
-	wiz->assistant = gtk_assistant_new( );
+	wiz->assistant = gtk_assistant_new();
 
 	gtk_window_set_title( GTK_WINDOW(wiz->assistant), _("SFLphone account creation wizard") );
 	gtk_window_set_position(GTK_WINDOW(wiz->assistant), GTK_WIN_POS_CENTER);
diff --git a/sflphone-client-gnome/src/assistant.h b/sflphone-client-gnome/src/config/assistant.h
similarity index 100%
rename from sflphone-client-gnome/src/assistant.h
rename to sflphone-client-gnome/src/config/assistant.h
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.c b/sflphone-client-gnome/src/config/preferencesdialog.c
index 400a7c499f5815feef83112f7445c18cb7353e87..49f575274b3ad6189a18600bb69efb31c9025948 100644
--- a/sflphone-client-gnome/src/config/preferencesdialog.c
+++ b/sflphone-client-gnome/src/config/preferencesdialog.c
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 
 #include <accountlist.h>
-#include <accountwindow.h>
+#include <accountconfigdialog.h>
 #include <actions.h>
 #include <config.h>
 #include <toolbar.h>
diff --git a/sflphone-client-gnome/src/menus.c b/sflphone-client-gnome/src/menus.c
index 3556b5d4e8b9230a99351310c4d1a266d5d40585..8c19df5aa3bd8d10ae3bf53265ade58211d91635 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,7 +550,14 @@ create_edit_menu()
     menu_items = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
 
-    menu_items = gtk_menu_item_new_with_mnemonic( _("_Accounts") );
+#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( _("_Manage accounts") );
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
     g_signal_connect_swapped (G_OBJECT (menu_items), "activate",
             G_CALLBACK (edit_accounts),