diff --git a/accountwizard/setupautoconfigkolabfreebusy.cpp b/accountwizard/setupautoconfigkolabfreebusy.cpp
index d3657d6a2d..52a1fe8965 100644
--- a/accountwizard/setupautoconfigkolabfreebusy.cpp
+++ b/accountwizard/setupautoconfigkolabfreebusy.cpp
@@ -1,109 +1,114 @@
 /*
     Copyright (c) 2014 Sandro Knauß <knauss@kolabsys.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "setupautoconfigkolabfreebusy.h"
 #include "configfile.h"
 
+#include <QFileInfo>
+
 #include <KLocalizedString>
 
 SetupAutoconfigKolabFreebusy::SetupAutoconfigKolabFreebusy(QObject *parent)
     : SetupObject(parent)
 {
     mIspdb = new AutoconfigKolabFreebusy(this);
     connect(mIspdb, SIGNAL(finished(bool)), SLOT(onIspdbFinished(bool)));
 }
 
 SetupAutoconfigKolabFreebusy::~SetupAutoconfigKolabFreebusy()
 {
     delete mIspdb;
 }
 
 int SetupAutoconfigKolabFreebusy::countFreebusyServers() const
 {
     return mIspdb->freebusyServers().count();
 }
 
 void SetupAutoconfigKolabFreebusy::fillFreebusyServer(int i, QObject *o) const
 {
     freebusy isp = mIspdb->freebusyServers().values()[i];
     ConfigFile *korganizer = qobject_cast<ConfigFile *>(o);
+    QFileInfo path =  QFileInfo(isp.path);
     QString url(QLatin1String("https://"));
 
     if (isp.socketType == Ispdb::None) {
         url = QLatin1String("http://");
     }
 
     url += isp.hostname;
 
     if (isp.port != 80) {
         url += QLatin1Char(':');
         url += QString::number(isp.port);
     }
 
     if (!isp.path.startsWith(QLatin1Char('/'))) {
         url += QLatin1Char('/');
     }
 
-    url += isp.path;
+    url += path.path();
+
+    bool fullDomainRetrieval = (path.baseName() == QLatin1String("$EMAIL$"));
 
     QString group(QLatin1String("FreeBusy Retrieve"));
 
-    korganizer->setConfig(group, QLatin1String("FreeBusyFullDomainRetrieval"), QLatin1String("true"));
+    korganizer->setConfig(group, QLatin1String("FreeBusyFullDomainRetrieval"),  QLatin1String(fullDomainRetrieval?"true":"false"));
     korganizer->setConfig(group, QLatin1String("FreeBusyRetrieveAuto"), QLatin1String("true"));
     korganizer->setConfig(group, QLatin1String("FreeBusyRetrieveUrl"), url);
     korganizer->setConfig(group, QLatin1String("FreeBusyRetrieverUser"), isp.username);
     korganizer->setConfig(group, QLatin1String("FreeBusyRetrieverPassword"), isp.password);
     if (!isp.password.isEmpty()) {
         korganizer->setConfig(group, QLatin1String("FreeBusyRetrieveSavePassword"), QLatin1String("true"));
     }
 }
 
 void SetupAutoconfigKolabFreebusy::start()
 {
     mIspdb->start();
     emit info(i18n("Searching for autoconfiguration..."));
 }
 
 void SetupAutoconfigKolabFreebusy::setEmail(const QString &email)
 {
     mIspdb->setEmail(email);
 }
 
 void SetupAutoconfigKolabFreebusy::setPassword(const QString &password)
 {
     mIspdb->setPassword(password);
 }
 
 void SetupAutoconfigKolabFreebusy::create()
 {
 }
 
 void SetupAutoconfigKolabFreebusy::destroy()
 {
 }
 
 void SetupAutoconfigKolabFreebusy::onIspdbFinished(bool status)
 {
     emit ispdbFinished(status);
     if (status) {
         emit info(i18n("Autoconfiguration found."));
     } else {
         emit info(i18n("Autoconfiguration failed."));
     }
 }