diff --git a/src/calibre/gui2/preferences/emailp.py b/src/calibre/gui2/preferences/emailp.py
index b22315f347..8d41df75ae 100644
--- a/src/calibre/gui2/preferences/emailp.py
+++ b/src/calibre/gui2/preferences/emailp.py
@@ -155,7 +155,7 @@ class EmailAccounts(QAbstractTableModel):  # {{{
             self.accounts[na] = self.accounts.pop(account)
             self.account_order[row] = na
             if '@kindle.com' in addr:
-                self.accounts[na][0] = 'AZW, MOBI, TPZ, PRC, AZW1'
+                self.accounts[na][0] = 'EPUB, TPZ'
 
         self.dataChanged.emit(
                 self.index(index.row(), 0), self.index(index.row(), 3))
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index c6b04e0202..e238b54d2d 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -553,7 +553,7 @@ class KindlePage(QWizardPage, KindleUI):
                 accounts = {}
             for y in accounts.values():
                 y[2] = False
-            accounts[x] = ['AZW, MOBI, TPZ, PRC, AZW1', True, True]
+            accounts[x] = ['EPUB, TPZ', True, True]
             conf.set('accounts', accounts)
 
     def nextId(self):