diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index bb4ed90ce8..72fef86eb0 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -420,9 +420,9 @@ class KindlePage(QWizardPage, KindleUI):
     def commit(self):
         x = unicode(self.to_address.text()).strip()
         parts = x.split('@')
-        if len(parts) < 2 or not parts[0]: return
 
-        if self.send_email_widget.set_email_settings(True):
+        if (self.send_email_widget.set_email_settings(True) and len(parts) >= 2
+                and parts[0]):
             conf = smtp_prefs()
             accounts = conf.parse().accounts
             if not accounts: accounts = {}