diff --git a/CHANGES b/CHANGES
index 7893929bb7b33c6eafe7dc1e2fd8c2207a4bb299..26d6b6057dc66c8ece52269c37bef628a2b48bf7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 
 SFLphone (0.4) / 2005-07-06
+	* Cleanup code
 	* Add autotools support
-	* Test on iMac with Ubuntu: Ok
 	* Handle CANCEL method
 	* PortAudio replace OSS and ALSA devices choice
 	* Add PortAudioCpp to make easy use of RingBuffer object for audio callback 
diff --git a/ChangeLog b/ChangeLog
index 9828436f5981376ad9d793e9c5f43d4bff2ca1f0..162951436f03857e8f9fa11e65eb68bc558a697c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Laurielle LEA (8 July 2005) version 0.4
 - Stop program when error opening skin file
 - Divide toggle() of qtguimainwindow.cpp in small functions
+- Add return test
 
 Laurielle LEA (7 July 2005) version 0.4
 - Cleanup audiortp.cpp
diff --git a/src/manager.cpp b/src/manager.cpp
index 79c799efce763887bfb187cae571e38f515b0a12..b59f8a3297977620b572d607f11967cf6c2f0dcf 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -132,7 +132,10 @@ Manager::init (void)
 	_voIPLinkVector->at(DFT_VOIP_LINK)->init();
 	if (get_config_fields_int(SIGNALISATION, AUTO_REGISTER) == YES and 
 			_exist == 1) {
-		registerVoIPLink();
+		if (registerVoIPLink() != 1) {
+			_debug("Registration failed\n");
+            displayErrorText("Check your configuration fields");
+		}
 	} 
 }
 
@@ -404,8 +407,11 @@ Manager::saveConfig (void)
 int 
 Manager::registerVoIPLink (void)
 {
-	_voIPLinkVector->at(DFT_VOIP_LINK)->setRegister();
-	return 1;
+	if (_voIPLinkVector->at(DFT_VOIP_LINK)->setRegister() == 0) {
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
 int