diff --git a/libretroshare/src/util/rsdebug.cc b/libretroshare/src/util/rsdebug.cc
index aade16282..434b06363 100644
--- a/libretroshare/src/util/rsdebug.cc
+++ b/libretroshare/src/util/rsdebug.cc
@@ -142,11 +142,12 @@ void rslog(const RsLog::logLvl lvl, RsLog::logInfo *info, const std::string &msg
 	if(info->lvl == RsLog::None)
 		return;
 
-	RsStackMutex stack(logMtx); /******** LOCKED ****************/
-
 	bool process = info->lvl == RsLog::Default ? (lvl <= defaultLevel) : lvl <= info->lvl;
-	if(process)
+	if(!process)
+		return;
+
 	{
+		RsStackMutex stack(logMtx); /******** LOCKED ****************/
 		time_t t = time(NULL);
 
 		if (debugMode == RS_DEBUG_LOGCRASH)
@@ -179,6 +180,9 @@ void rslog(const RsLog::logLvl lvl, RsLog::logInfo *info, const std::string &msg
 		fprintf(ofd, "(%s Z: %s, lvl: %u): %s \n",
 				timestr2.c_str(), info->name.c_str(), (unsigned int)info->lvl, msg.c_str());
 		fflush(ofd);
+
+		fprintf(stdout, "(%s Z: %s, lvl: %u): %s \n",
+		        timestr2.c_str(), info->name.c_str(), (unsigned int)info->lvl, msg.c_str());
 		lineCount++;
 	}
 }
diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index a7885922c..b2ffd555b 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -191,7 +191,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
     std::cerr << std::endl;
 #endif
 
-
     connect(ui.discComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
     connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
     connect(ui.localAddress,   SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
@@ -231,6 +230,10 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
 
 	QObject::connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateRelayMode()));
 	QObject::connect(ui.serverCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateRelayMode()));
+
+	// when the network menu is opened and the hidden service tab is already selected updateOutProxyIndicator() won't be called and thus resulting in wrong proxy indicators.
+	if (ui.tabWidget->currentIndex() == TAB_HIDDEN_SERVICE)
+		updateOutProxyIndicator();
 }
 
 void ServerPage::saveAndTestInProxy()