diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp
index b11646ef9..61057cec6 100644
--- a/src/kmail_part.cpp
+++ b/src/kmail_part.cpp
@@ -131,7 +131,6 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
     mainWidget->initializeFilterActions();
     mainWidget->tagActionManager()->createActions();
     mainWidget->folderShortcutActionManager()->createActions();
-    mainWidget->updateVacationScriptStatus();
     mainWidget->populateMessageListStatusFilterCombo();
     mainWidget->initializePluginActions();
     /*
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index 422458392..d64b09101 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -4338,11 +4338,6 @@ QWidget *KMMainWidget::vacationScriptIndicator() const
     return mVacationScriptIndicator;
 }
 
-void KMMainWidget::updateVacationScriptStatus()
-{
-    updateVacationScriptStatus(mVacationIndicatorActive);
-}
-
 FolderTreeView *KMMainWidget::folderTreeView() const
 {
     return mFolderTreeWidget->folderTreeView();
diff --git a/src/kmmainwidget.h b/src/kmmainwidget.h
index d6d1889ef..e8a663b7c 100644
--- a/src/kmmainwidget.h
+++ b/src/kmmainwidget.h
@@ -138,7 +138,6 @@ public:
     static const PtrList *mainWidgetList();
 
     QWidget *vacationScriptIndicator() const;
-    void updateVacationScriptStatus();
 
     MailCommon::FolderTreeView *folderTreeView() const;
 
diff --git a/src/widgets/vacationscriptindicatorwidget.cpp b/src/widgets/vacationscriptindicatorwidget.cpp
index c99049111..1aa97f593 100644
--- a/src/widgets/vacationscriptindicatorwidget.cpp
+++ b/src/widgets/vacationscriptindicatorwidget.cpp
@@ -80,6 +80,10 @@ VacationScriptIndicatorWidget::~VacationScriptIndicatorWidget()
 
 void VacationScriptIndicatorWidget::setVacationScriptActive(bool active, const QString &serverName)
 {
+    if (serverName.isEmpty()) {
+        return;
+    }
+
     if (active) {
         if (!mServerActive.contains(serverName)) {
             mServerActive.append(serverName);