diff --git a/urbackupserver/www/js/urbackup.js b/urbackupserver/www/js/urbackup.js
index f4f6b275..bdc38531 100644
--- a/urbackupserver/www/js/urbackup.js
+++ b/urbackupserver/www/js/urbackup.js
@@ -3415,20 +3415,22 @@ function show_settings2(data)
 			g.curr_settings = data.settings;
 			data.settings = getCurrentSettings(data.settings);
 			data.settings.backup_dirs_optional=getCheckboxValue(data.settings.backup_dirs_optional);
-			var internet_server = data.settings.internet_server;
+			var internet_server = unescapeHTML(data.settings.internet_server);
 			if(internet_server.indexOf("ws://")!=0 &&
 				internet_server.indexOf("wss://")!=0 &&
 				internet_server.indexOf("urbackup://")!=0 )
 			{
 				if(data.settings.internet_server_port==55415)
 				{
-					data.settings.internet_server = "urbackup://" + internet_server;
+					internet_server = "urbackup://" + internet_server;
 				}
 				else
 				{
-					data.settings.internet_server = "urbackup://" + internet_server + ":" + data.settings.internet_server_port;
+					internet_server = "urbackup://" + internet_server + ":" + data.settings.internet_server_port;
 				}
 			}
+
+			data.settings.internet_server = internet_server;
 			
 			var transfer_mode_params1=["raw", "hashed"];
 			var transfer_mode_params2=["raw", "hashed", "blockhash"];
diff --git a/urbackupserver/www/templates/settings_inv_row.htm b/urbackupserver/www/templates/settings_inv_row.htm
index 40cefabc..7dff2dea 100644
--- a/urbackupserver/www/templates/settings_inv_row.htm
+++ b/urbackupserver/www/templates/settings_inv_row.htm
@@ -526,7 +526,7 @@
 			<div class="form-group">
 				<label class="col-sm-4 control-label" for="internet_server">{tServer URL clients connect to}:</label>
 				<div class="col-sm-6">
-					<input type="text" class="form-control" id="internet_server" value="{internet_server|s}" placeholder="ws://example.com:55414/socket"/>
+					<input type="text" class="form-control" id="internet_server" value="{internet_server}" placeholder="ws://example.com:55414/socket"/>
 				</div>
 			</div>
 			<div class="form-group">