diff --git a/client/js/socket-events/configuration.js b/client/js/socket-events/configuration.js
index 3289dfeb..5443283c 100644
--- a/client/js/socket-events/configuration.js
+++ b/client/js/socket-events/configuration.js
@@ -176,6 +176,17 @@ function parseOverrideParams(params, data) {
 			continue;
 		}
 
+		// When the network is locked, URL overrides should not affect disabled fields
+		if (data.lockNetwork &&
+				["host", "port", "tls", "rejectUnauthorized"].includes(key)) {
+			continue;
+		}
+
+		// When the network is not displayed, its name in the UI is not customizable
+		if (!data.displayNetwork && key === "name") {
+			continue;
+		}
+
 		if (key === "join") {
 			value = value.split(",").map((chan) => {
 				if (!chan.match(/^[#&!+]/)) {
diff --git a/src/server.js b/src/server.js
index bb4f609d..8223e170 100644
--- a/src/server.js
+++ b/src/server.js
@@ -590,6 +590,7 @@ function getClientConfiguration(network) {
 	} else {
 		// Only send defaults that are visible on the client
 		config.defaults = _.pick(network || Helper.config.defaults, [
+			"name",
 			"nick",
 			"username",
 			"password",