diff --git a/src/usr/local/www/services_acb.php b/src/usr/local/www/services_acb.php
index c902c74d3a..6f7a7fc84a 100644
--- a/src/usr/local/www/services_acb.php
+++ b/src/usr/local/www/services_acb.php
@@ -505,7 +505,7 @@ if (!$legacy) {
 			</option>
 			<?endforeach?>
 			<? if ($host_not_found) { ?>
-				<option value='<?=$hostname?>' SELECTED><?=$hostname?></option>
+				<option value='<?=urlencode($hostname)?>' SELECTED><?=htmlspecialchars($hostname)?></option>
 			<? } ?>
 		</select>
 <?php }