diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a302ec868..d6ba66cbf 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -134,6 +134,13 @@ MainWindow::MainWindow(const QDir &home) :
 
     mainwindows.append(this); // add us to the list of open windows
 
+    // Network proxy
+    QNetworkProxyQuery npq(QUrl("http://www.google.com"));
+    QList<QNetworkProxy> listOfProxies = QNetworkProxyFactory::systemProxyForQuery(npq);
+    if (listOfProxies.count() > 0) {
+        QNetworkProxy::setApplicationProxy(listOfProxies.first());
+    }
+
     /*----------------------------------------------------------------------
      *  Basic GUI setup
      *--------------------------------------------------------------------*/
diff --git a/src/Pages.cpp b/src/Pages.cpp
index cef589651..3176cb5e3 100644
--- a/src/Pages.cpp
+++ b/src/Pages.cpp
@@ -27,7 +27,7 @@ ConfigurationPage::ConfigurationPage(MainWindow *main) : main(main)
     intervalMetrics = new IntervalMetricsPage;
     metadataPage = new MetadataPage(main);
     measuresPage = new MeasuresPage(main);
-    proxyPage = new ProxyPage(this, main);
+    //proxyPage = new ProxyPage(this, main); // we use system settings
 
     tabs->addTab(config, tr("Settings"));
     tabs->addTab(colorsPage, tr("Appearance"));
@@ -35,7 +35,7 @@ ConfigurationPage::ConfigurationPage(MainWindow *main) : main(main)
     tabs->addTab(intervalMetrics, tr("Interval Metrics"));
     tabs->addTab(metadataPage, tr("Ride Data"));
     tabs->addTab(measuresPage, tr("Athlete Data"));
-    tabs->addTab(proxyPage, tr("Proxy"));
+    //tabs->addTab(proxyPage, tr("Proxy")); // we use system settings
 
     langLabel = new QLabel(tr("Language:"));
 
@@ -247,7 +247,7 @@ ConfigurationPage::saveClicked()
     intervalMetrics->saveClicked();
     metadataPage->saveClicked();
     measuresPage->saveClicked();
-    proxyPage->saveClicked();
+    //proxyPage->saveClicked(); // We use system settings
 }
 
 void