diff --git a/sflphone-client-gnome/src/assistant.c b/sflphone-client-gnome/src/assistant.c
index d9e410c295c0d46415409c9dcb33bdd02a1db1c3..f7c979c07caf22518ed12bf4a40d0c05bbb66b14 100644
--- a/sflphone-client-gnome/src/assistant.c
+++ b/sflphone-client-gnome/src/assistant.c
@@ -146,7 +146,7 @@ static void sip_apply_callback( void ) {
         	    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ZRTP_NOT_SUPP_WARNING), g_strdup((gchar *)"true"));
         	    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ZRTP_HELLO_HASH), g_strdup((gchar *)"true"));
         	    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_DISPLAY_SAS_ONCE), g_strdup((gchar *)"false"));
-        	}
+        }
 		
 		dbus_add_account( current );
 		getMessageSummary(message, 
diff --git a/sflphone-client-gnome/src/config/accountwindow.c b/sflphone-client-gnome/src/config/accountwindow.c
index 455b43aa117b978e1416a1246064d9741322cb40..1c4df513f227bddc948161c24198913307f77ae4 100644
--- a/sflphone-client-gnome/src/config/accountwindow.c
+++ b/sflphone-client-gnome/src/config/accountwindow.c
@@ -1002,7 +1002,6 @@ show_account_window (account_t * a)
                 g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("false"));
             }
     		
-    	    DEBUG("TLS enable %s saved to file", (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(useSipTlsCheckBox)) ? "true":"false"));
     		g_hash_table_replace(currentAccount->properties, g_strdup(TLS_ENABLE), 
     		g_strdup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(useSipTlsCheckBox)) ? "true":"false"));
 
diff --git a/sflphone-client-gnome/src/config/configwindow.c b/sflphone-client-gnome/src/config/configwindow.c
index 2ad87ef081bf3d5b3363736613c60eadb2e74a2b..05f904296c13a35e7c62c80ea96af9e6a52a5251 100644
--- a/sflphone-client-gnome/src/config/configwindow.c
+++ b/sflphone-client-gnome/src/config/configwindow.c
@@ -117,9 +117,6 @@ config_window_fill_account_list()
                         -1);
             }
         }
-
-        gtk_widget_set_sensitive( GTK_WIDGET(editButton),   FALSE);
-        gtk_widget_set_sensitive( GTK_WIDGET(deleteButton), FALSE);
     }
 }
 
@@ -235,6 +232,8 @@ select_account(GtkTreeSelection *selection, GtkTreeModel *model)
         selectedAccount = NULL;
         gtk_widget_set_sensitive(GTK_WIDGET(accountMoveUpButton), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(accountMoveDownButton), FALSE);
+        gtk_widget_set_sensitive(GTK_WIDGET(editButton), FALSE);
+        gtk_widget_set_sensitive(GTK_WIDGET(deleteButton), FALSE);                
         return;
     }
 
@@ -248,6 +247,8 @@ select_account(GtkTreeSelection *selection, GtkTreeModel *model)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(accountMoveUpButton), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(accountMoveDownButton), TRUE);
+        gtk_widget_set_sensitive(GTK_WIDGET(editButton), TRUE);
+        gtk_widget_set_sensitive(GTK_WIDGET(deleteButton), TRUE);            
     }
     
     DEBUG("Selecting account in account window");
@@ -473,12 +474,14 @@ create_accounts_tab(GtkDialog * dialog)
     gtk_widget_show(addButton);
 
     editButton = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+    gtk_widget_set_sensitive(GTK_WIDGET(editButton), FALSE);    
     g_signal_connect_swapped(G_OBJECT(editButton), "clicked",
             G_CALLBACK(edit_account), NULL);
     gtk_box_pack_start(GTK_BOX(buttonBox), editButton, FALSE, FALSE, 0);
     gtk_widget_show(editButton);
 
     deleteButton = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+    gtk_widget_set_sensitive(GTK_WIDGET(deleteButton), FALSE);    
     g_signal_connect_swapped(G_OBJECT(deleteButton), "clicked",
             G_CALLBACK(delete_account), stunFrame);
     gtk_box_pack_start(GTK_BOX(buttonBox), deleteButton, FALSE, FALSE, 0);