diff --git a/src/Application.cpp b/src/Application.cpp
index 489b33a7d..c1b80e4ca 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -72,7 +72,6 @@ void Application::run()
 	if (!theConfig.DEBUG_LOGFILE.empty())
 	{ // Let DEBUG messages go to the file but only WARNING or higher to regular output
 		Log::setLogFile(theConfig.DEBUG_LOGFILE);
-		Log::setMinSeverity(lsWARNING);
 		LogPartition::setSeverity(lsDEBUG);
 	}
 
diff --git a/src/Log.cpp b/src/Log.cpp
index c2314dd77..c4cf54ea2 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -101,11 +101,12 @@ std::string Log::rotateLog(void)
   
 }
 
-void Log::setMinSeverity(LogSeverity s)
+void Log::setMinSeverity(LogSeverity s, bool all)
 {
 	boost::recursive_mutex::scoped_lock sl(sLock);
 	sMinSeverity = s;
-	LogPartition::setSeverity(s);
+	if (all)
+		LogPartition::setSeverity(s);
 }
 
 LogSeverity Log::getMinSeverity()
diff --git a/src/Log.h b/src/Log.h
index a0521f909..7dbc2c833 100644
--- a/src/Log.h
+++ b/src/Log.h
@@ -96,7 +96,7 @@ public:
 	static LogSeverity stringToSeverity(const std::string&);
 
 	static LogSeverity getMinSeverity();
-	static void setMinSeverity(LogSeverity);
+	static void setMinSeverity(LogSeverity, bool all);
 	static void setLogFile(boost::filesystem::path);
 	static std::string rotateLog(void);
 };
diff --git a/src/Peer.cpp b/src/Peer.cpp
index f115db278..9c5664ed3 100644
--- a/src/Peer.cpp
+++ b/src/Peer.cpp
@@ -219,7 +219,7 @@ void Peer::handleConnect(const boost::system::error_code& error, boost::asio::ip
 	}
 	else
 	{
-		std::cerr << "Connect peer: success." << std::endl;
+		cLog(lsINFO) << "Connect peer: success.";
 
 		mSocketSsl.set_verify_mode(boost::asio::ssl::verify_none);
 
diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp
index 46a59852e..c246c8eb9 100644
--- a/src/RPCServer.cpp
+++ b/src/RPCServer.cpp
@@ -1390,7 +1390,7 @@ Json::Value RPCServer::doProfile(const Json::Value &params)
 	if (iArgs >= 8 && "false" != params[7u].asString())
 		bSubmit	= true;
 
-	Log::setMinSeverity(lsFATAL);
+	Log::setMinSeverity(lsFATAL, true);
 
 	boost::posix_time::ptime			ptStart(boost::posix_time::microsec_clock::local_time());
 
@@ -2700,7 +2700,7 @@ Json::Value RPCServer::doLogLevel(const Json::Value& params)
 		LogSeverity sv = Log::stringToSeverity(params[0u].asString());
 		if (sv == lsINVALID)
 			return RPCError(rpcINVALID_PARAMS);
-		Log::setMinSeverity(sv);
+		Log::setMinSeverity(sv, true);
 		return RPCError(rpcSUCCESS);
 	}
 
@@ -2710,7 +2710,7 @@ Json::Value RPCServer::doLogLevel(const Json::Value& params)
 		if (sv == lsINVALID)
 			return RPCError(rpcINVALID_PARAMS);
 		if (params[2u].asString() == "base")
-			Log::setMinSeverity(sv);
+			Log::setMinSeverity(sv, false);
 		else if (!LogPartition::setSeverity(params[0u].asString(), sv))
 			return RPCError(rpcINVALID_PARAMS);
 		return RPCError(rpcSUCCESS);
diff --git a/src/main.cpp b/src/main.cpp
index d06f8838c..6c6356160 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -121,9 +121,10 @@ int main(int argc, char* argv[])
 	{
 		nothing();
 	}
-	else if (argc >= 2 && !strcmp(argv[1], "--test")) {
+	else if (argc >= 2 && !strcmp(argv[1], "--test"))
+	{
 		bTest	= true;
-		Log::setMinSeverity(lsTRACE);
+		Log::setMinSeverity(lsTRACE, true);
 	}
 	else
 	{
@@ -143,9 +144,9 @@ int main(int argc, char* argv[])
 	}
 
 	if (vm.count("verbose"))
-	{
-		Log::setMinSeverity(lsTRACE);
-	}
+		Log::setMinSeverity(lsTRACE, true);
+	else if (!bTest)
+		Log::setMinSeverity(lsWARNING, true);
 
 	if (!iResult)
 	{