diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 8b8dc5304..358d60cf6 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -168,8 +168,12 @@ private static AssistantActivity instance;
 					if (address != null && address.asString().equals(cfg.getAddress().asString()) ) {
 						if (state == RegistrationState.RegistrationOk) {
 							if (progress != null) progress.dismiss();
-							if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
+							if (getResources().getBoolean(R.bool.use_phone_number_validation)
+									&& cfg.getDomain().equals(getString(R.string.default_domain))
+									&& LinphoneManager.getLc().getDefaultProxyConfig() != null) {
 								accountCreator.isAccountUsed();
+							} else {
+								success();
 							}
 						} else if (state == RegistrationState.RegistrationFailed) {
 							if (progress != null) progress.dismiss();