diff --git a/ChangeLog b/ChangeLog
index fad220ba71..7722eff81e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ChangeLog
 =========
-version 1.6.2 (release 2014-07-x )
+version 1.6.2 (release 2014-07-28 )
+ * Limit the HTTP buffer size when downloading to limit memory consumption.
  * Another small mem leak fixed in HTTP Credentials.
  * Fix local file name clash detection for MacOSX.
  * Limit maximum wait time to ten seconds in network limiting.
diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index 394f1a77b4..ffbac81859 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -385,7 +385,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account)
 
 QList<QNetworkCookie> ShibbolethCredentials::accountCookies(Account *account)
 {
-    return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->url());
+    return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->davUrl());
 }
 
 QNetworkCookie ShibbolethCredentials::findShibCookie(Account *account, QList<QNetworkCookie> cookies)
diff --git a/src/wizard/owncloudsetuppage.cpp b/src/wizard/owncloudsetuppage.cpp
index da1e54a83b..8f4cb72453 100644
--- a/src/wizard/owncloudsetuppage.cpp
+++ b/src/wizard/owncloudsetuppage.cpp
@@ -16,6 +16,7 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QUrl>
+#include <QTimer>
 #include <QPushButton>
 #include <QMessageBox>
 
@@ -143,9 +144,12 @@ void OwncloudSetupPage::initializePage()
     if (Theme::instance()->overrideServerUrl().isEmpty()) {
         _ui.leUrl->setFocus();
     } else {
-        setVisible(false);
         setCommitPage(true);
         validatePage();
+        setVisible(false);
+        // because the wizard will call show on us right after this call, we need to hide in the
+        // next event loop iteration.
+        QTimer::singleShot(0, this, SLOT(hide()));
     }
 }
 
diff --git a/src/wizard/owncloudwizard.cpp b/src/wizard/owncloudwizard.cpp
index e2edeb6bd5..b1cdae10d6 100644
--- a/src/wizard/owncloudwizard.cpp
+++ b/src/wizard/owncloudwizard.cpp
@@ -171,7 +171,6 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
 
     if( id == WizardCommon::Page_ServerSetup ) {
         emit clearPendingRequests();
-        _setupPage->initializePage();
     }
 
     if( id == WizardCommon::Page_Result ) {