diff --git a/admin/inc/class.admin_mail.inc.php b/admin/inc/class.admin_mail.inc.php
index 7227aedcc5..5f538faa8e 100644
--- a/admin/inc/class.admin_mail.inc.php
+++ b/admin/inc/class.admin_mail.inc.php
@@ -368,7 +368,7 @@ class admin_mail
 			}
 		}
 		$readonlys['button[manual]'] = true;
-		unset($content['manual_class']);
+		unset($content['manual_class'], $content['button']);
 		$sel_options['acc_imap_ssl'] = self::$ssl_types;
 		$tpl->exec(static::APP_CLASS.'autoconfig', $content, $sel_options, $readonlys,
 			array_diff_key($content, ['output'=>true]), 2);
diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang
index 4424f2f3fa..debe339e60 100644
--- a/admin/lang/egw_de.lang
+++ b/admin/lang/egw_de.lang
@@ -840,6 +840,7 @@ site	admin	de	Site
 skip imap	admin	de	IMAP auslassen
 skipping imap configuration!	admin	de	IMAP-Konfiguration ausgelassen!
 smtp authentication	admin	de	SMTP-Anmeldung
+smtp only: to create only an smtp account	admin	de	SMTP only: nur ein SMTP Konto anzulegen
 smtp options	admin	de	SMTP-Optionen
 smtp server	admin	de	SMTP-Server
 smtp server name	admin	de	SMTP-Server Name
diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang
index b299e88e0d..f339a9c237 100644
--- a/admin/lang/egw_en.lang
+++ b/admin/lang/egw_en.lang
@@ -840,6 +840,7 @@ site	admin	en	Site
 skip imap	admin	en	Skip IMAP
 skipping imap configuration!	admin	en	Skipping IMAP configuration!
 smtp authentication	admin	en	SMTP authentication
+smtp only: to create only an smtp account	admin	en	SMTP only: to create only an SMTP account
 smtp options	admin	en	SMTP options
 smtp server	admin	en	SMTP server
 smtp server name	admin	en	SMTP server name
diff --git a/admin/templates/default/mailwizard.xet b/admin/templates/default/mailwizard.xet
index 62c1ecfa49..ef40245574 100644
--- a/admin/templates/default/mailwizard.xet
+++ b/admin/templates/default/mailwizard.xet
@@ -39,7 +39,7 @@
 					<et2-hbox  span="all">
 						<et2-button  label="Continue" id="button[continue]" onclick="app.admin.wizard_detect" image="continue"></et2-button>
 						<et2-button  label="Manual entry" id="button[manual]" onclick="app.admin.wizard_manual" image="edit"></et2-button>
-						<et2-button  label="Skip IMAP" id="button[skip_imap]" class="@manual_class" novalidate="1" image="bullet"></et2-button>
+						<et2-button  label="Skip IMAP" id="button[skip_imap]" image="bullet" noValidation="true" statustext="SMTP only: to create only an SMTP account"></et2-button>
 						<et2-button  label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" noSubmit="true"></et2-button>
 					</et2-hbox>
 				</row>