diff --git a/Telegram/SourceFiles/intro/intro_code.cpp b/Telegram/SourceFiles/intro/intro_code.cpp
index 5521275862..cae53b1ed2 100644
--- a/Telegram/SourceFiles/intro/intro_code.cpp
+++ b/Telegram/SourceFiles/intro/intro_code.cpp
@@ -292,10 +292,8 @@ void CodeWidget::codeSubmitFail(const MTP::Error &error) {
 		}).fail([=](const MTP::Error &error) {
 			codeSubmitFail(error);
 		}).handleFloodErrors().send();
-	} else if (Logs::DebugEnabled()) { // internal server error
-		showCodeError(rpl::single(err + ": " + error.description()));
-	} else {
-		showCodeError(rpl::single(Lang::Hard::ServerError()));
+	} else if (!MTP::IgnoreError(error)) {
+	    showCodeError(rpl::single(err));
 	}
 }
 
@@ -479,20 +477,12 @@ void CodeWidget::noTelegramCodeDone(const MTPauth_SentCode &result) {
 }
 
 void CodeWidget::noTelegramCodeFail(const MTP::Error &error) {
-	if (MTP::IsFloodError(error)) {
-		_noTelegramCodeRequestId = 0;
-		showCodeError(tr::lng_flood_error());
-		return;
-	} else if (error.type() == u"SEND_CODE_UNAVAILABLE"_q) {
-		_noTelegramCodeRequestId = 0;
-		return;
-	}
-
 	_noTelegramCodeRequestId = 0;
-	if (Logs::DebugEnabled()) { // internal server error
-		showCodeError(rpl::single(error.type() + ": " + error.description()));
-	} else {
-		showCodeError(rpl::single(Lang::Hard::ServerError()));
+	if (MTP::IsFloodError(error)) {
+		showCodeError(tr::lng_flood_error());
+	} else if (error.type() != u"SEND_CODE_UNAVAILABLE"_q
+	    && !MTP::IgnoreError(error)) {
+		showCodeError(rpl::single(error.type()));
 	}
 }
 
diff --git a/Telegram/SourceFiles/intro/intro_email.cpp b/Telegram/SourceFiles/intro/intro_email.cpp
index ecc8d7d636..6f0c88a8e9 100644
--- a/Telegram/SourceFiles/intro/intro_email.cpp
+++ b/Telegram/SourceFiles/intro/intro_email.cpp
@@ -118,7 +118,7 @@ EmailWidget::EmailWidget(
 					// Show box?
 					error->setText(Lang::Hard::EmailConfirmationExpired());
 				} else {
-					error->setText(Lang::Hard::ServerError());
+					error->setText(type);
 				}
 			};
 
diff --git a/Telegram/SourceFiles/intro/intro_password_check.cpp b/Telegram/SourceFiles/intro/intro_password_check.cpp
index 47bc74b5ba..2b98ad8961 100644
--- a/Telegram/SourceFiles/intro/intro_password_check.cpp
+++ b/Telegram/SourceFiles/intro/intro_password_check.cpp
@@ -156,12 +156,8 @@ void PasswordCheckWidget::pwdSubmitFail(const MTP::Error &error) {
 		goBack();
 	} else if (type == u"SRP_ID_INVALID"_q) {
 		handleSrpIdInvalid();
-	} else {
-		if (Logs::DebugEnabled()) { // internal server error
-			showError(rpl::single(type + ": " + error.description()));
-		} else {
-			showError(rpl::single(Lang::Hard::ServerError()));
-		}
+	} else if (!MTP::IgnoreError(error)) {
+		showError(rpl::single(type));
 		_pwdField->setFocus();
 	}
 }
@@ -264,12 +260,8 @@ void PasswordCheckWidget::codeSubmitFail(const MTP::Error &error) {
 		showError(tr::lng_signin_wrong_code());
 		_codeField->selectAll();
 		_codeField->showError();
-	} else {
-		if (Logs::DebugEnabled()) { // internal server error
-			showError(rpl::single(type + ": " + error.description()));
-		} else {
-			showError(rpl::single(Lang::Hard::ServerError()));
-		}
+	} else if (!MTP::IgnoreError(error)) {
+		showError(rpl::single(type));
 		_codeField->setFocus();
 	}
 }
diff --git a/Telegram/SourceFiles/intro/intro_phone.cpp b/Telegram/SourceFiles/intro/intro_phone.cpp
index 3f21283037..ace6c87b83 100644
--- a/Telegram/SourceFiles/intro/intro_phone.cpp
+++ b/Telegram/SourceFiles/intro/intro_phone.cpp
@@ -281,10 +281,8 @@ void PhoneWidget::phoneSubmitFail(const MTP::Error &error) {
 		showPhoneError(tr::lng_bad_phone());
 	} else if (err == u"PHONE_NUMBER_BANNED"_q) {
 		Ui::ShowPhoneBannedError(getData()->controller, _sentPhone);
-	} else if (Logs::DebugEnabled()) { // internal server error
-		showPhoneError(rpl::single(err + ": " + error.description()));
-	} else {
-		showPhoneError(rpl::single(Lang::Hard::ServerError()));
+	} else if (!MTP::IgnoreError(error)) {
+		showPhoneError(rpl::single(err));
 	}
 }
 
diff --git a/Telegram/SourceFiles/intro/intro_signup.cpp b/Telegram/SourceFiles/intro/intro_signup.cpp
index 9261e4ceed..96335c963f 100644
--- a/Telegram/SourceFiles/intro/intro_signup.cpp
+++ b/Telegram/SourceFiles/intro/intro_signup.cpp
@@ -141,12 +141,8 @@ void SignupWidget::nameSubmitFail(const MTP::Error &error) {
 	} else if (err == "LASTNAME_INVALID") {
 		showError(tr::lng_bad_name());
 		_last->setFocus();
-	} else {
-		if (Logs::DebugEnabled()) { // internal server error
-			showError(rpl::single(err + ": " + error.description()));
-		} else {
-			showError(rpl::single(Lang::Hard::ServerError()));
-		}
+	} else if (!MTP::IgnoreError(error)) {
+		showError(rpl::single(err));
 		if (_invertOrder) {
 			_last->setFocus();
 		} else {
diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp
index 7b2448b258..6f63ef6f16 100644
--- a/Telegram/SourceFiles/intro/intro_widget.cpp
+++ b/Telegram/SourceFiles/intro/intro_widget.cpp
@@ -614,9 +614,9 @@ void Widget::resetAccount() {
 			} else if (type == u"2FA_RECENT_CONFIRM"_q) {
 				Ui::show(Ui::MakeInformBox(
 					tr::lng_signin_reset_cancelled()));
-			} else {
+			} else if (!MTP::IgnoreError(error)) {
 				getData()->controller->hideLayer();
-				getStep()->showError(rpl::single(Lang::Hard::ServerError()));
+				getStep()->showError(rpl::single(type));
 			}
 		}).send();
 	});