diff --git a/tine20/Felamimail/Controller/Account.php b/tine20/Felamimail/Controller/Account.php
index 8f1b2aa36e9..a7bacd53ff9 100644
--- a/tine20/Felamimail/Controller/Account.php
+++ b/tine20/Felamimail/Controller/Account.php
@@ -1985,7 +1985,9 @@ protected function _autoCreateSystemAccountFolders(Felamimail_Model_Account $_ac
                      ] as $folder) {
                 $systemFolderField = $this->_getSystemFolderField($folder);
                 $folderName = $_account->{$systemFolderField};
-                $this->_createSystemFolder($_account, $folderName);
+                if (!empty($folderName)) {
+                    $this->_createSystemFolder($_account, $folderName);
+                }
             }
         } catch (Felamimail_Exception_IMAPInvalidCredentials $feiic) {
             Tinebase_Core::getLogger()->notice(__METHOD__ . '::' . __LINE__ . ' ' . $feiic->getMessage());