--- linphone/coreapi/authentication.old.c	2008-07-13 14:37:30.000000000 +0200
+++ linphone/coreapi/authentication.c	2008-07-13 14:37:37.000000000 +0200
@@ -245,7 +245,9 @@ void linphone_process_authentication(Lin
 	osip_message_t *resp=ev->response;
 	char *username;
 	
-	gstate_new_state(lc, GSTATE_REG_FAILED, "Authentication required");
+	if (strcmp(ev->request->sip_method,"REGISTER")==0) {
+		gstate_new_state(lc, GSTATE_REG_FAILED, "Authentication required");
+	}
 
 	username=osip_uri_get_username(resp->from->url);
 	prx_auth=(osip_proxy_authenticate_t*)osip_list_get(&resp->proxy_authenticates,0);
--- linphone/coreapi/exevents.old.c	2008-07-13 14:35:58.000000000 +0200
+++ linphone/coreapi/exevents.c	2008-07-13 14:36:49.000000000 +0200
@@ -297,7 +297,6 @@ int linphone_inc_new_call(LinphoneCore *
 		goto end;
 	}
 	lc->call=linphone_call_new_incoming(lc,from,to,ev->cid,ev->did,ev->tid);
-	gstate_new_state(lc, GSTATE_CALL_IN_INVITE, NULL);
 	if (sdp==NULL){
 		ms_message("No sdp body in invite, 200-ack scheme");
 		err=0;
@@ -309,6 +308,7 @@ int linphone_inc_new_call(LinphoneCore *
 		if (from_2char_without_params(from_url,&tmp)!=0){
 			tmp=ms_strdup("Unknown user");
 		}
+		gstate_new_state(lc, GSTATE_CALL_IN_INVITE, tmp);
 		barmesg=ortp_strdup_printf("%s %s",tmp,_("is contacting you."));
 		lc->vtable.show(lc);
 		lc->vtable.display_status(lc,barmesg);