diff --git a/src/gui/src/PluginWizardPage.cpp b/src/gui/src/PluginWizardPage.cpp
index 27328fbc..26da661f 100644
--- a/src/gui/src/PluginWizardPage.cpp
+++ b/src/gui/src/PluginWizardPage.cpp
@@ -20,7 +20,6 @@
 
 #include "SslCertificate.h"
 #include "FileSysClient.h"
-#include "WebClient.h"
 #include "PluginManager.h"
 #include "MainWindow.h"
 
@@ -178,21 +177,19 @@ bool PluginWizardPage::isComplete() const
 void PluginWizardPage::initializePage()
 {
 	QWizardPage::initializePage();
+
+	if (m_Email.isEmpty() ||
+		m_Password.isEmpty()) {
+		updateStatus(tr("Setup complete."));
+		showFinished();
+		return;
+	}
+
 	if (m_pFileSysClient == NULL) {
-		if (m_Email.isEmpty() ||
-			m_Password.isEmpty()) {
-			updateStatus(tr("Setup complete."));
-			showFinished();
-			return;
-		}
+		m_pFileSysClient = new FileSysClient();
 
 		m_pLabelSpinning->show();
 
-		m_pFileSysClient = new FileSysClient();
-		m_pWebClient = new WebClient();
-		m_pWebClient->setEmail(m_Email);
-		m_pWebClient->setPassword(m_Password);
-
 		QThread* thread = new QThread;
 
 		connect(m_pFileSysClient,
diff --git a/src/gui/src/PluginWizardPage.h b/src/gui/src/PluginWizardPage.h
index 8b2006b7..d8cef4cc 100644
--- a/src/gui/src/PluginWizardPage.h
+++ b/src/gui/src/PluginWizardPage.h
@@ -25,7 +25,6 @@
 #include <QWizardPage>
 
 class FileSysClient;
-class WebClient;
 class SslCertificate;
 class MainWindow;
 
@@ -62,7 +61,6 @@ private:
 	bool m_Finished;
 	QString m_Email;
 	QString m_Password;
-	WebClient* m_pWebClient;
 	FileSysClient* m_pFileSysClient;
 	PluginManager m_PluginManager;
 	SslCertificate* m_pSslCertificate;