diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index 2cddb537c..d2b2e37f3 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -881,6 +881,23 @@ static UICompositeViewDescription *compositeDescription = nil;
 	}
 }
 
+- (void) isAccountActivated:(const char *)resp {
+	if (currentView != _createAccountView) {
+		if( linphone_account_creator_get_phone_number(account_creator) == NULL) {
+			[self configureProxyConfig];
+			[PhoneMainView.instance changeCurrentView:AssistantLinkView.compositeViewDescription];
+		} else {
+			[PhoneMainView.instance changeCurrentView:DialerView.compositeViewDescription];
+		}
+	} else {
+		if (!linphone_account_creator_get_username(account_creator)) {
+			[self showErrorPopup:"ERROR_ALIAS_ALREADY_IN_USE"];
+		} else {
+			[self showErrorPopup:"ERROR_ACCOUNT_ALREADY_IN_USE"];
+		}
+	}
+}
+
 #pragma mark - Account creator callbacks
 
 void assistant_is_account_used(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
@@ -943,12 +960,7 @@ void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAcc
 	AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator));
 	thiz.waitView.hidden = YES;
 	if (status == LinphoneAccountCreatorAccountActivated) {
-		if( linphone_account_creator_get_phone_number(creator) == NULL) {
-			[thiz configureProxyConfig];
-			[PhoneMainView.instance changeCurrentView:AssistantLinkView.compositeViewDescription];
-		} else {
-			[PhoneMainView.instance changeCurrentView:DialerView.compositeViewDescription];
-		}
+		[thiz isAccountActivated:resp];
 	} else if (status == LinphoneAccountCreatorAccountNotActivated) {
 		if (!IPAD || linphone_account_creator_get_phone_number(creator) != NULL) {
 			//Re send SMS if the username is the phone number
diff --git a/Classes/Base.lproj/AboutView.strings b/Classes/Base.lproj/AboutView.strings
index d4a070336..19b2330a5 100644
Binary files a/Classes/Base.lproj/AboutView.strings and b/Classes/Base.lproj/AboutView.strings differ
diff --git a/Classes/Base.lproj/AssistantLinkView.strings b/Classes/Base.lproj/AssistantLinkView.strings
index 2be816fe5..4396611fe 100644
Binary files a/Classes/Base.lproj/AssistantLinkView.strings and b/Classes/Base.lproj/AssistantLinkView.strings differ
diff --git a/Classes/Base.lproj/AssistantViewScreens.strings b/Classes/Base.lproj/AssistantViewScreens.strings
index 919ec41e2..a7219fcf6 100644
Binary files a/Classes/Base.lproj/AssistantViewScreens.strings and b/Classes/Base.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/Base.lproj/ShopView.strings b/Classes/Base.lproj/ShopView.strings
index a5c86efab..cc79d924b 100644
Binary files a/Classes/Base.lproj/ShopView.strings and b/Classes/Base.lproj/ShopView.strings differ
diff --git a/Classes/LinphoneUI/UICheckBoxTableView.m b/Classes/LinphoneUI/UICheckBoxTableView.m
index 60a7ce174..f153f58cc 100644
--- a/Classes/LinphoneUI/UICheckBoxTableView.m
+++ b/Classes/LinphoneUI/UICheckBoxTableView.m
@@ -51,7 +51,7 @@
 
 - (void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
-	_emptyView.hidden = _editButton.enabled = ([self totalNumberOfItems] != 0);
+	_emptyView.hidden = _editButton.enabled = ([self totalNumberOfItems] > 0);
 }
 
 - (void)toggleRowSelectionForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -123,8 +123,8 @@
 - (void)loadData {
 	[_selectedItems removeAllObjects];
 	[self.tableView reloadData];
-
-	_editButton.enabled = _emptyView.hidden = ([self totalNumberOfItems] > 0);
+	
+	_emptyView.hidden = _editButton.enabled = ([self totalNumberOfItems] > 0);
 }
 
 - (void)removeSelectionUsing:(void (^)(NSIndexPath *indexPath))remover {
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 2cd663c29..fce0e8960 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Settings/InAppSettings.bundle/en.lproj/Network.strings b/Settings/InAppSettings.bundle/en.lproj/Network.strings
index 7b2f1efff..892d4f442 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Network.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Network.strings
@@ -3,6 +3,8 @@
 "Stun Server" = "Stun Server";
 "ICE" = "ICE";
 "TURN" = "TURN";
+"TURN's Username" = "TURN's Username";
+"TURN's Password" = "TURN's Password";
 "Random Port" = "Random Port";
 "Port" = "Port";
 "Audio Port(s)" = "Audio Port(s)";