diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index e8e8905d1ba7493f44cff9b6a5ec704534520d12..aabdd755bad9d6b1452e806ff0f86c297dbc8f4a 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -39,8 +39,8 @@ EventThread::~EventThread (void)
 void
 EventThread::run (void) 
 {
-  stopIt = false;
-  while(!stopIt) {
+  //stopIt = false;
+  while(!testCancel()) {
     _linkthread->getEvent();
   }
 }
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 48612dec24eb04208c064a5bcf64a579f2e2a0b5..00cc13ce505af9f4091a37681001c369c9887474 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -2134,18 +2134,18 @@ ManagerImpl::sendRegister( const ::DBus::String& accountID , bool expire )
   // Test on the value freshly updated
   if ( acc->isEnabled() ) {
     // As we don't support multiple SIP account, we have to unregister everything before
-    AccountMap::iterator iter = _accountMap.begin();
-    while ( iter != _accountMap.end() ) {
-      if ( iter->second ) {
-	setConfig( iter->first , CONFIG_ACCOUNT_ENABLE , false );
-        iter->second->unregisterVoIPLink();
-      }
-      iter++;
-    }
+    //AccountMap::iterator iter = _accountMap.begin();
+    //while ( iter != _accountMap.end() ) {
+      //if ( iter->second ) {
+	//setConfig( iter->first , CONFIG_ACCOUNT_ENABLE , false );
+        //iter->second->unregisterVoIPLink();
+      //}
+      //iter++;
+    //}
     // Verify we aren't already registered, then register
     //if (acc->getRegistrationState() != VoIPLink::Registered) {
       _debug("Send register for account %s\n" , accountID.c_str());
-      setConfig( accountID , CONFIG_ACCOUNT_ENABLE , true );
+      //setConfig( accountID , CONFIG_ACCOUNT_ENABLE , true );
       acc->registerVoIPLink();
     //}
   } else {
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index 7d98ba1a63d12ab8aa16325becd43a54ec83acff..01ece811a435203c82a24978b900d446e097788c 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -217,7 +217,6 @@ void
 SIPVoIPLink::getEvent()
 {
 	char* tmp2;
-	const char* localport = ""+_localPort;
 	eXosip_event_t* event = eXosip_event_wait(0, 50);
 	eXosip_lock();
 	eXosip_automatic_action();
@@ -233,11 +232,11 @@ SIPVoIPLink::getEvent()
 		_debugMid(" !EXOSIP_REGISTRATION_NEW event is not implemented\n");
 		break;
 	case EXOSIP_REGISTRATION_SUCCESS:     /** 01 < user is successfully registred.  */
-		_debugMid(" !EXOSIP_REGISTRATION_SUCCESS \n");
+		_debugMid(" !EXOSIP_REGISTRATION_SUCCESS ---> %s\n" , getAccountID().c_str());
 		if(_eXosipRegID == EXOSIP_ERROR_STD){
 		  _debug("Successfully Unregister account ID = %s\n" , getAccountID().c_str());
 		  setRegistrationState(Unregistered);
-		  if( _evThread ) _evThread->stop();
+		  //if( _evThread ) _evThread->stop();
 		}
 		else{
 		  _debug("Successfully Register account ID = %s\n" , getAccountID().c_str());
@@ -1421,6 +1420,7 @@ SIPVoIPLink::SIPCallRequestFailure(eXosip_event_t *event)
   case SIP_NOT_ACCEPTABLE_HERE: // 488 */
     // Display error on the screen phone
     {
+      _debug("--------------------------------------------------------------error message: %s\n", event->response->reason_phrase);
       SIPCall* call = findSIPCallWithCid(event->cid);
       if (call!=0) {
         CallID& id = call->getCallId();
diff --git a/src/voiplink.cpp b/src/voiplink.cpp
index ad0c07dea774d1f97633a5b3647b4da2392dd002..2af83fc6341a71add244ceea8bda63ae8e31dbc2 100644
--- a/src/voiplink.cpp
+++ b/src/voiplink.cpp
@@ -84,13 +84,13 @@ VoIPLink::clearCallMap()
 void
 VoIPLink::setRegistrationState(const enum RegistrationState state, const std::string& errorMessage)
 {
-  /** @todo Push to the GUI when state changes */
   _registrationState = state;
   _registrationError = errorMessage;
 
   std::string acc_ID = getAccountID();
   _debug("Set registration state for account %s\n" , acc_ID.c_str());
 
+  /** Push to the GUI when state changes */
   switch (state) {
   case Registered:
     Manager::instance().registrationSucceed(acc_ID);