diff --git a/sflphone-client-gnome/src/assistant.c b/sflphone-client-gnome/src/assistant.c
index 192c3269958933cadff2e9791ff2556dbbe009ce..c054f9b3cc798d4035dda2f3fa648ffee87bcb91 100644
--- a/sflphone-client-gnome/src/assistant.c
+++ b/sflphone-client-gnome/src/assistant.c
@@ -157,6 +157,9 @@ static void iax_apply_callback( void ) {
 		g_hash_table_insert(current->properties, g_strdup(ACCOUNT_USERNAME), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_username))));
 		g_hash_table_insert(current->properties, g_strdup(ACCOUNT_HOSTNAME), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_server))));
 		g_hash_table_insert(current->properties, g_strdup(ACCOUNT_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_password))));
+		//g_hash_table_insert(current->properties, g_strdup(ACCOUNT_RESOLVE_ONCE), g_strdup("FALSE"));
+		//g_hash_table_insert(current->properties, g_strdup(ACCOUNT_REGISTRATION_EXPIRE), g_strdup("600"));
+
 		dbus_add_account( current );
 		getMessageSummary(message, 
 			gtk_entry_get_text (GTK_ENTRY(wiz->iax_alias)),
diff --git a/sflphone-client-gnome/src/config/accountwindow.c b/sflphone-client-gnome/src/config/accountwindow.c
index 493233362a1fddd6e1614ebd44ad26462513a034..4b3855064e0597cae2fbc0b6f4aa5de84040cc4e 100644
--- a/sflphone-client-gnome/src/config/accountwindow.c
+++ b/sflphone-client-gnome/src/config/accountwindow.c
@@ -50,340 +50,346 @@ GtkWidget * entryResolveNameOnlyOnce;
 GtkWidget * entryExpire;
 
 /* Signal to entryProtocol 'changed' */
-    void
+	void
 change_protocol (account_t * currentAccount UNUSED)
 {
-    (gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(entryProtocol));
+	(gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(entryProtocol));
 }
 
-    int
+	int
 is_iax_enabled(void)
 {
-    int res = dbus_is_iax2_enabled();
-    if(res == 1)
-        return TRUE;
-    else
-        return FALSE;
+	int res = dbus_is_iax2_enabled();
+	if(res == 1)
+		return TRUE;
+	else
+		return FALSE;
 }
 
-static GtkWidget * createAccountTab(account_t * a) 
+static GtkWidget * createAccountTab(account_t **a) 
 {
-    GtkWidget * frame;
-    GtkWidget * table;
+	GtkWidget * frame;
+	GtkWidget * table;
+	account_t *currentAccount;
 #if GTK_CHECK_VERSION(2,16,0)
 #else
-    GtkWidget *image;
+	GtkWidget *image;
 #endif
 
-    // Default settings
-    gchar * curAccountID = "";
-    gchar * curAccountEnabled = "TRUE";
-    gchar * curAccountResolveOnce = "FALSE";
-    gchar * curAccountType = "SIP";
-    gchar * curAlias = "";
-    gchar * curUsername = "";
-    gchar * curHostname = "";
-    gchar * curPassword = "";
-    /* TODO: add curProxy, and add boxes for Proxy support */
-    gchar * curMailbox = "";
-        
-    account_t * currentAccount = a;
-
-    // Load from SIP/IAX/Unknown ?
-    if(a)
-    {
-        curAccountID = a->accountID;
-        curAccountType = g_hash_table_lookup(currentAccount->properties, ACCOUNT_TYPE);
-        curAccountEnabled = g_hash_table_lookup(currentAccount->properties, ACCOUNT_ENABLED);
-        curAlias = g_hash_table_lookup(currentAccount->properties, ACCOUNT_ALIAS);
-        curHostname = g_hash_table_lookup(currentAccount->properties, ACCOUNT_HOSTNAME);
-        curPassword = g_hash_table_lookup(currentAccount->properties, ACCOUNT_PASSWORD);
-        curUsername = g_hash_table_lookup(currentAccount->properties, ACCOUNT_USERNAME);
-        curMailbox = g_hash_table_lookup(currentAccount->properties, ACCOUNT_MAILBOX);
-        curAccountResolveOnce = g_hash_table_lookup(currentAccount->properties, ACCOUNT_RESOLVE_ONCE);
-    }
-    else
-    {
-        currentAccount = g_new0(account_t, 1);
-        currentAccount->properties = g_hash_table_new(NULL, g_str_equal);
-        curAccountID = "new";
-    }
-    
-    gnome_main_section_new (_("Account Parameters"), &frame);
-    gtk_widget_show(frame);
-
-    table = gtk_table_new (9, 2  ,  FALSE/* homogeneous */);
-    gtk_table_set_row_spacings( GTK_TABLE(table), 10);
-    gtk_table_set_col_spacings( GTK_TABLE(table), 10);
-    gtk_widget_show(table);
-    gtk_container_add( GTK_CONTAINER( frame) , table );
+	// Default settings
+	gchar * curAccountID = "";
+	gchar * curAccountEnabled = "TRUE";
+	gchar * curAccountResolveOnce = "FALSE";
+	gchar * curAccountType = "SIP";
+	gchar * curAlias = "";
+	gchar * curUsername = "";
+	gchar * curHostname = "";
+	gchar * curPassword = "";
+	/* TODO: add curProxy, and add boxes for Proxy support */
+	gchar * curMailbox = "";
+
+	currentAccount = *a;
+
+	// Load from SIP/IAX/Unknown ?
+	if(currentAccount)
+	{
+		curAccountID = currentAccount->accountID;
+		curAccountType = g_hash_table_lookup(currentAccount->properties, ACCOUNT_TYPE);
+		curAccountEnabled = g_hash_table_lookup(currentAccount->properties, ACCOUNT_ENABLED);
+		curAlias = g_hash_table_lookup(currentAccount->properties, ACCOUNT_ALIAS);
+		curHostname = g_hash_table_lookup(currentAccount->properties, ACCOUNT_HOSTNAME);
+		curPassword = g_hash_table_lookup(currentAccount->properties, ACCOUNT_PASSWORD);
+		curUsername = g_hash_table_lookup(currentAccount->properties, ACCOUNT_USERNAME);
+		curMailbox = g_hash_table_lookup(currentAccount->properties, ACCOUNT_MAILBOX);
+		curAccountResolveOnce = g_hash_table_lookup(currentAccount->properties, ACCOUNT_RESOLVE_ONCE);
+	}
+	else
+	{
+		currentAccount = g_new0(account_t, 1);
+		currentAccount->properties = g_hash_table_new(NULL, g_str_equal);
+		curAccountID = "new";
+	}
+
+	gnome_main_section_new (_("Account Parameters"), &frame);
+	gtk_widget_show(frame);
+
+	table = gtk_table_new (9, 2  ,  FALSE/* homogeneous */);
+	gtk_table_set_row_spacings( GTK_TABLE(table), 10);
+	gtk_table_set_col_spacings( GTK_TABLE(table), 10);
+	gtk_widget_show(table);
+	gtk_container_add( GTK_CONTAINER( frame) , table );
 
 #ifdef DEBUG
-    label = gtk_label_new_with_mnemonic ("ID:");
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
-    entryID = gtk_entry_new();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryID);
-    gtk_entry_set_text(GTK_ENTRY(entryID), curAccountID);
-    gtk_widget_set_sensitive( GTK_WIDGET(entryID), FALSE);
-    gtk_table_attach ( GTK_TABLE( table ), entryID, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	label = gtk_label_new_with_mnemonic ("ID:");
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	entryID = gtk_entry_new();
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryID);
+	gtk_entry_set_text(GTK_ENTRY(entryID), curAccountID);
+	gtk_widget_set_sensitive( GTK_WIDGET(entryID), FALSE);
+	gtk_table_attach ( GTK_TABLE( table ), entryID, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 #endif
 
-    entryEnabled = gtk_check_button_new_with_mnemonic(_("_Enable this account"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(entryEnabled),
-            g_strcasecmp(curAccountEnabled,"TRUE") == 0 ? TRUE: FALSE);
-    gtk_table_attach ( GTK_TABLE( table ), entryEnabled, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_widget_set_sensitive( GTK_WIDGET( entryEnabled ) , TRUE );
-
-    label = gtk_label_new_with_mnemonic (_("_Alias"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
-    entryAlias = gtk_entry_new();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryAlias);
-    gtk_entry_set_text(GTK_ENTRY(entryAlias), curAlias);
-    gtk_table_attach ( GTK_TABLE( table ), entryAlias, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
-    label = gtk_label_new_with_mnemonic (_("_Protocol"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
-    entryProtocol = gtk_combo_box_new_text();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryProtocol);
-    gtk_combo_box_append_text(GTK_COMBO_BOX(entryProtocol), "SIP");
-    if( is_iax_enabled() ) gtk_combo_box_append_text(GTK_COMBO_BOX(entryProtocol), "IAX");
-    if(strcmp(curAccountType, "SIP") == 0)
-    {
-        gtk_combo_box_set_active(GTK_COMBO_BOX(entryProtocol),0);
-    }
-    else if(strcmp(curAccountType, "IAX") == 0)
-    {
-        gtk_combo_box_set_active(GTK_COMBO_BOX(entryProtocol),1);
-    }
-    else
-    {
-        /* Should never come here, add debug message. */
-        gtk_combo_box_append_text(GTK_COMBO_BOX(entryProtocol), _("Unknown"));
-        gtk_combo_box_set_active(GTK_COMBO_BOX(entryProtocol),2);
-    }
-    gtk_table_attach ( GTK_TABLE( table ), entryProtocol, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
-    /* Link signal 'changed' */
-    g_signal_connect (G_OBJECT (GTK_COMBO_BOX(entryProtocol)), "changed",
-            G_CALLBACK (change_protocol),
-            currentAccount);
-
-    label = gtk_label_new_with_mnemonic (_("_Host name"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
-    entryHostname = gtk_entry_new();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryHostname);
-    gtk_entry_set_text(GTK_ENTRY(entryHostname), curHostname);
-    gtk_table_attach ( GTK_TABLE( table ), entryHostname, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
-    label = gtk_label_new_with_mnemonic (_("_User name"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	entryEnabled = gtk_check_button_new_with_mnemonic(_("_Enable this account"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(entryEnabled),
+			g_strcasecmp(curAccountEnabled,"TRUE") == 0 ? TRUE: FALSE);
+	gtk_table_attach ( GTK_TABLE( table ), entryEnabled, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_widget_set_sensitive( GTK_WIDGET( entryEnabled ) , TRUE );
+
+	label = gtk_label_new_with_mnemonic (_("_Alias"));
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	entryAlias = gtk_entry_new();
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryAlias);
+	gtk_entry_set_text(GTK_ENTRY(entryAlias), curAlias);
+	gtk_table_attach ( GTK_TABLE( table ), entryAlias, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new_with_mnemonic (_("_Protocol"));
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	entryProtocol = gtk_combo_box_new_text();
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryProtocol);
+	gtk_combo_box_append_text(GTK_COMBO_BOX(entryProtocol), "SIP");
+	if( is_iax_enabled() ) gtk_combo_box_append_text(GTK_COMBO_BOX(entryProtocol), "IAX");
+	if(strcmp(curAccountType, "SIP") == 0)
+	{
+		gtk_combo_box_set_active(GTK_COMBO_BOX(entryProtocol),0);
+	}
+	else if(strcmp(curAccountType, "IAX") == 0)
+	{
+		gtk_combo_box_set_active(GTK_COMBO_BOX(entryProtocol),1);
+	}
+	else
+	{
+		/* Should never come here, add debug message. */
+		gtk_combo_box_append_text(GTK_COMBO_BOX(entryProtocol), _("Unknown"));
+		gtk_combo_box_set_active(GTK_COMBO_BOX(entryProtocol),2);
+	}
+	gtk_table_attach ( GTK_TABLE( table ), entryProtocol, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	/* Link signal 'changed' */
+	g_signal_connect (G_OBJECT (GTK_COMBO_BOX(entryProtocol)), "changed",
+			G_CALLBACK (change_protocol),
+			currentAccount);
+
+	label = gtk_label_new_with_mnemonic (_("_Host name"));
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	entryHostname = gtk_entry_new();
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryHostname);
+	gtk_entry_set_text(GTK_ENTRY(entryHostname), curHostname);
+	gtk_table_attach ( GTK_TABLE( table ), entryHostname, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new_with_mnemonic (_("_User name"));
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
 #if GTK_CHECK_VERSION(2,16,0)
 	entryUsername = gtk_entry_new();
-    gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entryUsername), GTK_ENTRY_ICON_PRIMARY, gdk_pixbuf_new_from_file(ICONS_DIR "/stock_person.svg", NULL));
+	gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entryUsername), GTK_ENTRY_ICON_PRIMARY, gdk_pixbuf_new_from_file(ICONS_DIR "/stock_person.svg", NULL));
 #else
-    entryUsername = sexy_icon_entry_new();
-    image = gtk_image_new_from_file( ICONS_DIR "/stock_person.svg" );
-    sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(entryUsername), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) );
+	entryUsername = sexy_icon_entry_new();
+	image = gtk_image_new_from_file( ICONS_DIR "/stock_person.svg" );
+	sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(entryUsername), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) );
 #endif
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryUsername);
-    gtk_entry_set_text(GTK_ENTRY(entryUsername), curUsername);
-    gtk_table_attach ( GTK_TABLE( table ), entryUsername, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryUsername);
+	gtk_entry_set_text(GTK_ENTRY(entryUsername), curUsername);
+	gtk_table_attach ( GTK_TABLE( table ), entryUsername, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-    label = gtk_label_new_with_mnemonic (_("_Password"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	label = gtk_label_new_with_mnemonic (_("_Password"));
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
 #if GTK_CHECK_VERSION(2,16,0)
 	entryPassword = gtk_entry_new();
-    gtk_entry_set_icon_from_stock (GTK_ENTRY (entryPassword), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_DIALOG_AUTHENTICATION);
+	gtk_entry_set_icon_from_stock (GTK_ENTRY (entryPassword), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_DIALOG_AUTHENTICATION);
 #else
-    entryPassword = sexy_icon_entry_new();
-    image = gtk_image_new_from_stock( GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR );
-    sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(entryPassword), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) );
+	entryPassword = sexy_icon_entry_new();
+	image = gtk_image_new_from_stock( GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR );
+	sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(entryPassword), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) );
 #endif
-    gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryPassword);
-    gtk_entry_set_text(GTK_ENTRY(entryPassword), curPassword);
-    gtk_table_attach ( GTK_TABLE( table ), entryPassword, 1, 2, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
-    label = gtk_label_new_with_mnemonic (_("_Voicemail number"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 8, 9, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
-    entryMailbox = gtk_entry_new();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryMailbox);
-    gtk_entry_set_text(GTK_ENTRY(entryMailbox), curMailbox);
-    gtk_table_attach ( GTK_TABLE( table ), entryMailbox, 1, 2, 8, 9, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
-    gtk_widget_show_all( table );
-    gtk_container_set_border_width (GTK_CONTAINER(table), 10);
-
-    return frame;
+	gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryPassword);
+	gtk_entry_set_text(GTK_ENTRY(entryPassword), curPassword);
+	gtk_table_attach ( GTK_TABLE( table ), entryPassword, 1, 2, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new_with_mnemonic (_("_Voicemail number"));
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 8, 9, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	entryMailbox = gtk_entry_new();
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryMailbox);
+	gtk_entry_set_text(GTK_ENTRY(entryMailbox), curMailbox);
+	gtk_table_attach ( GTK_TABLE( table ), entryMailbox, 1, 2, 8, 9, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	gtk_widget_show_all( table );
+	gtk_container_set_border_width (GTK_CONTAINER(table), 10);
+
+	*a = currentAccount;
+	return frame;
 }
 
-GtkWidget * createAdvancedTab(account_t * a)
+GtkWidget * createAdvancedTab(account_t **a)
 {
-    GtkWidget * frame;
-    GtkWidget * table;
-
-    // Default settings
-    gchar * curAccountResolveOnce = "FALSE"; 
-    gchar * curAccountExpire = "600"; 
-     
-    account_t * currentAccount = a;
-
-    // Load from SIP/IAX/Unknown ?
-    if(currentAccount) {
-        curAccountResolveOnce = g_hash_table_lookup(currentAccount->properties, ACCOUNT_RESOLVE_ONCE);
-        curAccountExpire = g_hash_table_lookup(currentAccount->properties, ACCOUNT_REGISTRATION_EXPIRE);
-    } 
-    
-    gnome_main_section_new (_("Advanced Settings"), &frame);
-    gtk_widget_show(frame);
-
-    table = gtk_table_new (2, 2,  FALSE/* homogeneous */);
-    gtk_table_set_row_spacings( GTK_TABLE(table), 10);
-    gtk_table_set_col_spacings( GTK_TABLE(table), 10);
-    gtk_widget_show(table);
-    gtk_container_add( GTK_CONTAINER( frame) , table );
-
-    label = gtk_label_new_with_mnemonic (_("Registration _expire"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
-    entryExpire = gtk_entry_new();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryExpire);
-    gtk_entry_set_text(GTK_ENTRY(entryExpire), curAccountExpire);
-    gtk_table_attach ( GTK_TABLE( table ), entryExpire, 1, 2, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    
-    entryResolveNameOnlyOnce = gtk_check_button_new_with_mnemonic(_("_Conform to RFC 3263"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(entryResolveNameOnlyOnce),
-            g_strcasecmp(curAccountResolveOnce,"FALSE") == 0 ? TRUE: FALSE);
-    gtk_table_attach ( GTK_TABLE( table ), entryResolveNameOnlyOnce, 0, 2, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_widget_set_sensitive( GTK_WIDGET( entryResolveNameOnlyOnce ) , TRUE );
-    
-    gtk_widget_show_all( table );
-    gtk_container_set_border_width (GTK_CONTAINER(table), 10);
-
-    return frame;
+	GtkWidget * frame;
+	GtkWidget * table;
+	account_t * currentAccount;
+
+	// Default settings
+	gchar * curAccountResolveOnce = "FALSE"; 
+	gchar * curAccountExpire = "600"; 
+
+	 currentAccount = *a;
+
+	// Load from SIP/IAX/Unknown ?
+	if(currentAccount) {
+		curAccountResolveOnce = g_hash_table_lookup(currentAccount->properties, ACCOUNT_RESOLVE_ONCE);
+		curAccountExpire = g_hash_table_lookup(currentAccount->properties, ACCOUNT_REGISTRATION_EXPIRE);
+	} 
+
+	gnome_main_section_new (_("Advanced Settings"), &frame);
+	gtk_widget_show(frame);
+
+	table = gtk_table_new (2, 2,  FALSE/* homogeneous */);
+	gtk_table_set_row_spacings( GTK_TABLE(table), 10);
+	gtk_table_set_col_spacings( GTK_TABLE(table), 10);
+	gtk_widget_show(table);
+	gtk_container_add( GTK_CONTAINER( frame) , table );
+
+	label = gtk_label_new_with_mnemonic (_("Registration _expire"));
+	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
+	entryExpire = gtk_entry_new();
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryExpire);
+	gtk_entry_set_text(GTK_ENTRY(entryExpire), curAccountExpire);
+	gtk_table_attach ( GTK_TABLE( table ), entryExpire, 1, 2, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+
+	entryResolveNameOnlyOnce = gtk_check_button_new_with_mnemonic(_("_Conform to RFC 3263"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(entryResolveNameOnlyOnce),
+			g_strcasecmp(curAccountResolveOnce,"FALSE") == 0 ? TRUE: FALSE);
+	gtk_table_attach ( GTK_TABLE( table ), entryResolveNameOnlyOnce, 0, 2, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+	gtk_widget_set_sensitive( GTK_WIDGET( entryResolveNameOnlyOnce ) , TRUE );
+
+	gtk_widget_show_all( table );
+	gtk_container_set_border_width (GTK_CONTAINER(table), 10);
+
+	*a = currentAccount;
+	return frame;
 }
 
-    void
+	void
 show_account_window (account_t * a)
 {
 
-    GtkWidget * notebook;
-    GtkWidget * tab; 
-    gint response;
-     
-    account_t * currentAccount = a;
-       
-    dialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("Account settings"),
-                GTK_WINDOW(get_main_window()),
-                GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                GTK_STOCK_APPLY,
-                GTK_RESPONSE_ACCEPT,
-                GTK_STOCK_CANCEL,
-                GTK_RESPONSE_CANCEL,
-                NULL));
-
-    gtk_dialog_set_has_separator(dialog, TRUE);
-    gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
-
-    notebook = gtk_notebook_new();
-    gtk_box_pack_start(GTK_BOX (dialog->vbox), notebook, TRUE, TRUE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(notebook), 10);
-    gtk_widget_show(notebook);
-    
-    /* General Settings */
-    tab = createAccountTab(a);
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Basic")));
-    gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
-    
-    /* Advanced */
-    tab = createAdvancedTab(a);
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Advanced")));
-    gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
-    
-    gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook) ,  0);
-        
-    response = gtk_dialog_run (GTK_DIALOG (dialog));
-    if(response == GTK_RESPONSE_ACCEPT)
-    {
-        gchar* proto = (gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(entryProtocol));
-
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_ENABLED),
-                g_strdup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(entryEnabled)) ? "TRUE": "FALSE"));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_RESOLVE_ONCE),
-                g_strdup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(entryResolveNameOnlyOnce)) ? "FALSE": "TRUE"));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_ALIAS),
-                g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryAlias))));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_TYPE),
-                g_strdup(proto));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_HOSTNAME),
-                g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryHostname))));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_USERNAME),
-                g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryUsername))));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_PASSWORD),
-                g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryPassword))));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_MAILBOX),
-                g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryMailbox))));
-        g_hash_table_replace(currentAccount->properties,
-                g_strdup(ACCOUNT_REGISTRATION_EXPIRE),
-                g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryExpire))));
-
-        if (strcmp(proto, "SIP") == 0) {
-            guint i, size;
-            account_t * account;
-            gchar * stun_srv;
-            gchar * stun_enable;
-            gboolean flag = FALSE;
-
-            size = account_list_get_size();
-            // If a SIP account already exists, fetch its information about STUN
-            for(i=0; i<size; i++){
-                account = account_list_get_nth(i);
-                if( strcmp(g_hash_table_lookup(account->properties, ACCOUNT_TYPE), "SIP" ) == 0 )
-                {
-                    stun_srv = g_hash_table_lookup(account->properties, ACCOUNT_SIP_STUN_SERVER);
-                    stun_enable = g_hash_table_lookup(account->properties, ACCOUNT_SIP_STUN_ENABLED);
-                    g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER),
-                                            g_strdup(stun_srv));
-                    g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED),
-                                            g_strdup(stun_enable));
-                    flag = TRUE;
-                    break;
-                }
-            }
-
-            // Otherwise set a default value
-            if(!flag)
-            {
-                g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), (gchar*)"");
-                g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED),
-                                            "FALSE");
-            }
-
-            config_window_set_stun_visible();
-        }
-
-        /** @todo Verify if it's the best condition to check */
-        if (currentAccount->accountID == NULL) {
-            dbus_add_account(currentAccount);
-        }
-        else {
-            dbus_set_account_details(currentAccount);
-        }
-    }
-    gtk_widget_destroy (GTK_WIDGET(dialog));
+	GtkWidget * notebook;
+	GtkWidget * tab; 
+	gint response;
+	account_t *currentAccount;
+
+	currentAccount = a;   
+
+	dialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("Account settings"),
+				GTK_WINDOW(get_main_window()),
+				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+				GTK_STOCK_APPLY,
+				GTK_RESPONSE_ACCEPT,
+				GTK_STOCK_CANCEL,
+				GTK_RESPONSE_CANCEL,
+				NULL));
+
+	gtk_dialog_set_has_separator(dialog, TRUE);
+	gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
+
+	notebook = gtk_notebook_new();
+	gtk_box_pack_start(GTK_BOX (dialog->vbox), notebook, TRUE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(notebook), 10);
+	gtk_widget_show(notebook);
+
+	/* General Settings */
+	tab = createAccountTab(&currentAccount);
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Basic")));
+	gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
+
+	/* Advanced */
+	tab = createAdvancedTab(&currentAccount);
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Advanced")));
+	gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
+
+	gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook) ,  0);
+
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	if(response == GTK_RESPONSE_ACCEPT)
+	{
+		gchar* proto = (gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(entryProtocol));
+
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_ENABLED),
+				g_strdup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(entryEnabled)) ? "TRUE": "FALSE"));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_RESOLVE_ONCE),
+				g_strdup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(entryResolveNameOnlyOnce)) ? "FALSE": "TRUE"));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_ALIAS),
+				g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryAlias))));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_TYPE),
+				g_strdup(proto));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_HOSTNAME),
+				g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryHostname))));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_USERNAME),
+				g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryUsername))));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_PASSWORD),
+				g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryPassword))));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_MAILBOX),
+				g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryMailbox))));
+		g_hash_table_replace(currentAccount->properties,
+				g_strdup(ACCOUNT_REGISTRATION_EXPIRE),
+				g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryExpire))));
+
+		if (strcmp(proto, "SIP") == 0) {
+			guint i, size;
+			account_t * account;
+			gchar * stun_srv;
+			gchar * stun_enable;
+			gboolean flag = FALSE;
+
+			size = account_list_get_size();
+			// If a SIP account already exists, fetch its information about STUN
+			for(i=0; i<size; i++){
+				account = account_list_get_nth(i);
+				if( strcmp(g_hash_table_lookup(account->properties, ACCOUNT_TYPE), "SIP" ) == 0 )
+				{
+					stun_srv = g_hash_table_lookup(account->properties, ACCOUNT_SIP_STUN_SERVER);
+					stun_enable = g_hash_table_lookup(account->properties, ACCOUNT_SIP_STUN_ENABLED);
+					g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER),
+							g_strdup(stun_srv));
+					g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED),
+							g_strdup(stun_enable));
+					flag = TRUE;
+					break;
+				}
+			}
+
+			// Otherwise set a default value
+			if(!flag)
+			{
+				g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), (gchar*)"");
+				g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED),
+						"FALSE");
+			}
+
+			config_window_set_stun_visible();
+		}
+
+		/** @todo Verify if it's the best condition to check */
+		if (currentAccount->accountID == NULL) {
+			dbus_add_account(currentAccount);
+		}
+		else {
+			dbus_set_account_details(currentAccount);
+		}
+	}
+	gtk_widget_destroy (GTK_WIDGET(dialog));
 }