diff --git a/src/org/linphone/ui/AddressText.java b/src/org/linphone/ui/AddressText.java
index 55faf0bd3..bd9f5ea97 100644
--- a/src/org/linphone/ui/AddressText.java
+++ b/src/org/linphone/ui/AddressText.java
@@ -41,11 +41,20 @@ public class AddressText extends EditText implements AddressType {
 	}
 
 	public void setContactAddress(String uri, String displayedName) {
-		this.displayedName = displayedName;
 		setText(uri);
+		this.displayedName = displayedName;
 	}
 
 	public void setDisplayedName(String displayedName) {
 		this.displayedName = displayedName;
 	}
+
+	@Override
+	protected void onTextChanged(CharSequence text, int start, int before,
+			int after) {
+		clearDisplayedName();
+		super.onTextChanged(text, start, before, after);
+	}
+
+	
 }
diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java
index 986281b88..902657045 100644
--- a/src/org/linphone/ui/Digit.java
+++ b/src/org/linphone/ui/Digit.java
@@ -87,12 +87,11 @@ public class Digit extends Button implements AddressAware {
 			} else if (mAddress != null) {
 				int lBegin = mAddress.getSelectionStart();
 				if (lBegin == -1) {
-					lBegin = mAddress.getEditableText().length();
+					lBegin = mAddress.length();
 				}
 				if (lBegin >=0) {
 					mAddress.getEditableText().insert(lBegin,mKeyCode);
 				}
-				mAddress.clearDisplayedName();
 			}
 		}
 
diff --git a/src/org/linphone/ui/EraseButton.java b/src/org/linphone/ui/EraseButton.java
index 122535062..8e253e765 100644
--- a/src/org/linphone/ui/EraseButton.java
+++ b/src/org/linphone/ui/EraseButton.java
@@ -36,7 +36,6 @@ public class EraseButton extends Button implements OnClickListener, OnLongClickL
 	}
 
 	public void onClick(View v) {
-		address.clearDisplayedName();
 		if (address.getText().length() >0) {
 			int lBegin = address.getSelectionStart();
 			if (lBegin == -1) {