diff --git a/src/ServerTunnelPane.cpp b/src/ServerTunnelPane.cpp
index ea8f376..7423221 100644
--- a/src/ServerTunnelPane.cpp
+++ b/src/ServerTunnelPane.cpp
@@ -138,19 +138,21 @@ int ServerTunnelPane::appendServerTunnelForm(
         tunnelGridLayout->addLayout(horizontalLayout_2);
     }
 
-    if(type==i2p::client::I2P_TUNNELS_SECTION_TYPE_HTTP) {
+    {
         std::string hostOverride = tunnelConfig->gethostOverride();
         QHBoxLayout *horizontalLayout_2 = new QHBoxLayout();
         horizontalLayout_2->setObjectName(QStringLiteral("horizontalLayout_2"));
         ui.hostOverrideLabel = new QLabel(gridLayoutWidget_2);
         hostOverrideLabel->setObjectName(QStringLiteral("hostOverrideLabel"));
         horizontalLayout_2->addWidget(hostOverrideLabel);
+        hostOverrideLabel->setEnabled(type==i2p::client::I2P_TUNNELS_SECTION_TYPE_HTTP);
         ui.hostOverrideLineEdit = new QLineEdit(gridLayoutWidget_2);
         hostOverrideLineEdit->setObjectName(QStringLiteral("hostOverrideLineEdit"));
         hostOverrideLineEdit->setText(hostOverride.c_str());
         QObject::connect(hostOverrideLineEdit, SIGNAL(textChanged(const QString &)),
                              this, SLOT(updated()));
         horizontalLayout_2->addWidget(hostOverrideLineEdit);
+        hostOverrideLineEdit->setEnabled(type==i2p::client::I2P_TUNNELS_SECTION_TYPE_HTTP);
         QSpacerItem * horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
         horizontalLayout_2->addItem(horizontalSpacer);
         tunnelGridLayout->addLayout(horizontalLayout_2);
diff --git a/src/ServerTunnelPane.h b/src/ServerTunnelPane.h
index f9f53b9..64fee10 100644
--- a/src/ServerTunnelPane.h
+++ b/src/ServerTunnelPane.h
@@ -107,8 +107,7 @@ private:
         inPortLabel->setText(QApplication::translate("srvTunForm", "InPort:", 0));
         cryptoTypeLabel->setText(QApplication::translate("srvTunForm", "Crypto type:", 0));
         accessListLabel->setText(QApplication::translate("srvTunForm", "Access list:", 0));
-        if(tunnelConfig->getType()==i2p::client::I2P_TUNNELS_SECTION_TYPE_HTTP)
-            hostOverrideLabel->setText(QApplication::translate("srvTunForm", "Host override:", 0));
+        hostOverrideLabel->setText(QApplication::translate("srvTunForm", "Host override:", 0));
         webIRCPassLabel->setText(QApplication::translate("srvTunForm", "WebIRC password:", 0));
         addressLabel->setText(QApplication::translate("srvTunForm", "Address:", 0));
 
@@ -181,6 +180,10 @@ protected:
         stc->setisUniqueLocal(isUniqueLocalCheckBox->isChecked());
 
         stc->setsigType(readSigTypeComboboxUI(sigTypeComboBox));
+
+        hostOverrideLabel->setEnabled(stc->getType()==i2p::client::I2P_TUNNELS_SECTION_TYPE_HTTP);
+        hostOverrideLineEdit->setEnabled(stc->getType()==i2p::client::I2P_TUNNELS_SECTION_TYPE_HTTP);
+
         return true;
     }
 };