diff --git a/qt/i2pd_qt/TunnelConfig.cpp b/qt/i2pd_qt/TunnelConfig.cpp
index 0de17486..8cf86d14 100644
--- a/qt/i2pd_qt/TunnelConfig.cpp
+++ b/qt/i2pd_qt/TunnelConfig.cpp
@@ -6,12 +6,25 @@ void TunnelConfig::saveHeaderToStringStream(std::stringstream& out) {
 }
 
 void TunnelConfig::saveI2CPParametersToStringStream(std::stringstream& out) {
-    out << "inbound.length=" << i2cpParameters.getInbound_length().toStdString() << "\n"
-        << "outbound.length=" << i2cpParameters.getOutbound_length().toStdString() << "\n"
-        << "inbound.quantity=" << i2cpParameters.getInbound_quantity().toStdString() << "\n"
-        << "outbound.quantity=" << i2cpParameters.getOutbound_quantity().toStdString() << "\n"
-        << "crypto.tagsToSend=" << i2cpParameters.getCrypto_tagsToSend().toStdString() << "\n"
-        << "explicitPeers=" << i2cpParameters.getExplicitPeers().toStdString() << "\n\n";
+		if (i2cpParameters.getInbound_length().toUShort() != i2p::client::DEFAULT_INBOUND_TUNNEL_LENGTH)
+				out << i2p::client::I2CP_PARAM_INBOUND_TUNNEL_LENGTH << "="
+						<< i2cpParameters.getInbound_length().toStdString() << "\n";
+		if (i2cpParameters.getOutbound_length().toUShort() != i2p::client::DEFAULT_OUTBOUND_TUNNEL_LENGTH)
+				out << i2p::client::I2CP_PARAM_OUTBOUND_TUNNEL_LENGTH << "="
+						<< i2cpParameters.getOutbound_length().toStdString() << "\n";
+		if (i2cpParameters.getInbound_quantity().toUShort() != i2p::client::DEFAULT_INBOUND_TUNNELS_QUANTITY)
+				out << i2p::client::I2CP_PARAM_INBOUND_TUNNELS_QUANTITY << "="
+						<< i2cpParameters.getInbound_quantity().toStdString() << "\n";
+		if (i2cpParameters.getOutbound_quantity().toUShort() != i2p::client::DEFAULT_OUTBOUND_TUNNELS_QUANTITY)
+				out << i2p::client::I2CP_PARAM_OUTBOUND_TUNNELS_QUANTITY << "="
+						<< i2cpParameters.getOutbound_quantity().toStdString() << "\n";
+		if (i2cpParameters.getCrypto_tagsToSend().toUShort() != i2p::client::DEFAULT_TAGS_TO_SEND)
+				out << i2p::client::I2CP_PARAM_TAGS_TO_SEND << "="
+						<< i2cpParameters.getCrypto_tagsToSend().toStdString() << "\n";
+    if (!i2cpParameters.getExplicitPeers().isEmpty())
+				out << i2p::client::I2CP_PARAM_EXPLICIT_PEERS << "="
+						<< i2cpParameters.getExplicitPeers().toStdString() << "\n";
+    out << "\n";
 }
 
 void ClientTunnelConfig::saveToStringStream(std::stringstream& out) {
diff --git a/qt/i2pd_qt/TunnelConfig.h b/qt/i2pd_qt/TunnelConfig.h
index 087ec30b..c714a4f5 100644
--- a/qt/i2pd_qt/TunnelConfig.h
+++ b/qt/i2pd_qt/TunnelConfig.h
@@ -5,6 +5,7 @@
 #include <string>
 
 #include "../../libi2pd_client/ClientContext.h"
+#include "../../libi2pd/Destination.h"
 #include "TunnelsPageUpdateListener.h"