diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index 7a837e9a0..0d38be00a 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -36,6 +36,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -45,7 +46,8 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 	private EditText code;
 	private boolean recoverAccount = false, linkAccount = false;
 	private int code_length;
-	private Button checkAccount, back;
+	private ImageView back;
+	private Button checkAccount;
 	private LinphoneAccountCreator accountCreator;
 
 	@Override
@@ -66,8 +68,7 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 		accountCreator.setUsername(username);
 		accountCreator.setPhoneNumber(phone, dialcode);
 
-
-        back = (Button) view.findViewById(R.id.cancel);
+		back = (ImageView) view.findViewById(R.id.back);
 		if (back != null)
 			back.setVisibility(Button.INVISIBLE);
 
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 3f42e1a8a..eac447b13 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -364,7 +364,11 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
-		AssistantActivity.instance().displayAssistantCodeConfirm(accountCreator.getUsername(), phoneNumberEdit.getText().toString(), LinphoneUtils.getCountryCode(dialCode), true);
+		if (status.equals(LinphoneAccountCreator.Status.ErrorServer)) {
+			LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(LinphoneAccountCreator.Status.Failed), AssistantActivity.instance());
+		} else {
+			AssistantActivity.instance().displayAssistantCodeConfirm(accountCreator.getUsername(), phoneNumberEdit.getText().toString(), LinphoneUtils.getCountryCode(dialCode), true);
+		}
 	}
 
 	@Override