diff --git a/Classes/AssistantLinkView.h b/Classes/AssistantLinkView.h
index 20131201a..0e3dcb1e8 100644
--- a/Classes/AssistantLinkView.h
+++ b/Classes/AssistantLinkView.h
@@ -20,6 +20,7 @@
 @property(weak, nonatomic) IBOutlet UIRoundBorderedButton *checkValidationButton;
 @property(weak, nonatomic) IBOutlet UIView *waitView;
 @property(weak, nonatomic) IBOutlet UITextField *phoneField;
+@property BOOL firstTime;
 
 - (IBAction)onLinkAccount:(id)sender;
 - (IBAction)onCheckValidationButton:(id)sender;
diff --git a/Classes/AssistantLinkView.m b/Classes/AssistantLinkView.m
index f1e402a19..b73fc9929 100644
--- a/Classes/AssistantLinkView.m
+++ b/Classes/AssistantLinkView.m
@@ -21,7 +21,7 @@
 	[super viewDidLoad];
 	// every UITextField subviews with phone keyboard must be tweaked to have a done button
 	[self addDoneButtonRecursivelyInView:self.view];
-	self.phoneField.delegate = self;
+	self.phoneField.delegate = self; self.firstTime = TRUE;
 }
 
 - (void)addDoneButtonRecursivelyInView:(UIView *)subview {
@@ -80,7 +80,7 @@
 		}
 	}
 
-	if (country) {
+	if (country && self.firstTime) {
 		[self didSelectCountry:country];
 	}
 }
@@ -195,6 +195,7 @@ void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, Linph
 }
 
 - (IBAction)onCountryClick:(id)sender {
+	self.firstTime = FALSE;
 	CountryListView *view = VIEW(CountryListView);
 	[view setDelegate:(id)self];
 	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];