diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 4d63cdc426..88896cebe2 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -121,7 +121,9 @@ void Application::setupSystemTray()
 void Application::slotTrayClicked( QSystemTrayIcon::ActivationReason reason )
 {
   if( reason == QSystemTrayIcon::Trigger ) {
-    if( _folderMap.isEmpty() ) {
+    // check if there is a mirall.cfg already.
+    QFile fi( QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/mirall.cfg" );
+    if( !fi.exists() ) {
       qDebug() << "No configured folders yet, start the Owncloud integration dialog.";
       _owncloudSetup->startWizard();
     } else {
diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp
index 029c27827b..8f6f71800c 100644
--- a/src/mirall/folderwizard.cpp
+++ b/src/mirall/folderwizard.cpp
@@ -31,9 +31,9 @@ FolderWizardSourcePage::FolderWizardSourcePage()
 {
     _ui.setupUi(this);
     registerField("sourceFolder*", _ui.localFolderLineEdit);
-    _ui.localFolderLineEdit->setText( QString( "%1/%2").arg( QDir::homePath() ).arg("Owncloud" ) );
+    _ui.localFolderLineEdit->setText( QString( "%1/%2").arg( QDir::homePath() ).arg("ownCloud" ) );
     registerField("alias*", _ui.aliasLineEdit);
-    _ui.aliasLineEdit->setText( QString::fromLatin1("Owncloud") );
+    _ui.aliasLineEdit->setText( QString::fromLatin1("ownCloud") );
 }
 
 FolderWizardSourcePage::~FolderWizardSourcePage()
@@ -177,7 +177,7 @@ FolderWizardOwncloudPage::~FolderWizardOwncloudPage()
 
 void FolderWizardOwncloudPage::initializePage()
 {
-    _ui.lineEditOCAlias->setText( "Owncloud" );
+    _ui.lineEditOCAlias->setText( "ownCloud" );
     _ui.lineEditOCUrl->setText( "http://localhost/owncloud" );
     QString user( getenv("USER"));
     _ui.lineEditOCUser->setText( user );