diff --git a/linphone/coreapi/siplogin.c b/linphone/coreapi/siplogin.c
index 1e55bc444..df878e770 100644
--- a/linphone/coreapi/siplogin.c
+++ b/linphone/coreapi/siplogin.c
@@ -33,7 +33,7 @@ static void sip_login_init_instance(SipSetupContext *ctx){
 static int sip_login_do_login(SipSetupContext * ctx, const char *uri, const char *passwd){
 	LinphoneProxyConfig *cfg=sip_setup_context_get_proxy_config(ctx);
 	LinphoneCore *lc=linphone_proxy_config_get_core(cfg);
-	LinphoneAuthInfo *auth=linphone_auth_info_new(ctx->username,NULL,passwd,NULL,NULL);
+	LinphoneAuthInfo *auth=linphone_auth_info_new(ctx->username,NULL,passwd,NULL,ctx->domain);
 	linphone_proxy_config_set_identity(cfg,uri);
 	linphone_core_add_auth_info(lc,auth);
 	linphone_proxy_config_enable_register(cfg,TRUE);
diff --git a/linphone/gtk-glade/loginframe.c b/linphone/gtk-glade/loginframe.c
index f54dbcda5..98b8aeeca 100644
--- a/linphone/gtk-glade/loginframe.c
+++ b/linphone/gtk-glade/loginframe.c
@@ -19,12 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "linphone.h"
 
+enum {
+	NetworkKindAdsl,
+	NetworkKindOpticalFiber
+};
+
 void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	GtkWidget *label=linphone_gtk_get_widget(mw,"login_label");
 	LinphoneAuthInfo *ai;
 	gchar *str;
 	osip_from_t *from;
+	LinphoneCore *lc=linphone_gtk_get_core();
+	int nettype;
 
 	gtk_widget_hide(linphone_gtk_get_widget(mw,"idle_frame"));
 	gtk_widget_show(linphone_gtk_get_widget(mw,"login_frame"));
@@ -38,12 +45,17 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
 	osip_from_init(&from);
 	osip_from_parse(from,linphone_proxy_config_get_identity(cfg));
 	
-	ai=linphone_core_find_auth_info(linphone_gtk_get_core(),linphone_proxy_config_get_domain(cfg),from->url->username);
+	ai=linphone_core_find_auth_info(lc,linphone_proxy_config_get_domain(cfg),from->url->username);
 	/*display the last entered username*/
 	gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(mw,"login_username")),
 		from->url->username);
 	gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(mw,"login_password")),
 		ai!=NULL ? ai->passwd : "");
+	if (linphone_core_get_download_bandwidth(lc)==0 &&
+		linphone_core_get_upload_bandwidth(lc)==0)
+		nettype=NetworkKindOpticalFiber;
+	else nettype=NetworkKindAdsl;
+	gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"login_internet_kind")),nettype);
 	osip_from_free(from);
 }
 
@@ -55,10 +67,13 @@ void linphone_gtk_exit_login_frame(void){
 	gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"modes"),TRUE);
 }
 
-enum {
-	NetworkKindAdsl,
-	NetworkKindOpticalFiber
-};
+gboolean check_login_ok(LinphoneProxyConfig *cfg){
+	if (linphone_proxy_config_is_registered(cfg)){
+		linphone_gtk_exit_login_frame();
+		return FALSE;	
+	}
+	return TRUE;
+}
 
 void linphone_gtk_login_frame_connect_clicked(GtkWidget *button){
 	GtkWidget *mw=gtk_widget_get_toplevel(button);
@@ -73,6 +88,7 @@ void linphone_gtk_login_frame_connect_clicked(GtkWidget *button){
 
 	username=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(mw,"login_username")));
 	password=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(mw,"login_password")));
+
 	netkind_id=gtk_combo_box_get_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"login_internet_kind")));
 
 	if (netkind_id==NetworkKindAdsl){
@@ -90,6 +106,9 @@ void linphone_gtk_login_frame_connect_clicked(GtkWidget *button){
 	osip_from_to_str(from,&identity);
 	osip_from_free(from);
 	if (sip_setup_context_login_account(ssctx,identity,password)==0){
-		linphone_gtk_exit_login_frame();
+		guint t=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mw),"login_tout"));
+		if (t!=0) g_source_remove(t);
+		t=g_timeout_add(50000,(GSourceFunc)check_login_ok,cfg);
+		g_object_set_data(G_OBJECT(mw),"login_tout",GINT_TO_POINTER(t));
 	}
 }
diff --git a/linphone/gtk-glade/main.glade b/linphone/gtk-glade/main.glade
index ffcdab03f..0177f28ee 100644
--- a/linphone/gtk-glade/main.glade
+++ b/linphone/gtk-glade/main.glade
@@ -1235,6 +1235,7 @@ Fiber Channel</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_stock">True</property>
+                                <signal name="clicked" handler="linphone_gtk_login_frame_connect_clicked"/>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>