diff --git a/management/daemon.py b/management/daemon.py
index 572b6b4a..481873b7 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -334,7 +334,7 @@ def ssl_get_status():
 
 	# What domains can we provision certificates for? What unexpected problems do we have?
 	provision, cant_provision = get_certificates_to_provision(env, show_valid_certs=False)
-	
+
 	# What's the current status of TLS certificates on all of the domain?
 	domains_status = get_web_domains_info(env)
 	domains_status = [
@@ -520,6 +520,16 @@ def privacy_status_set():
 	utils.write_settings(config, env)
 	return "OK"
 
+@app.route('/system/smtp/relay', methods=["GET"])
+@authorized_personnel_only
+def smtp_relay_get():
+	pass
+
+@app.route('/system/smtp/relay', methods=["POST"])
+@authorized_personnel_only
+def smtp_relay_set():
+	pass
+
 # MUNIN
 
 @app.route('/munin/')
diff --git a/management/templates/smtp-relays.html b/management/templates/smtp-relays.html
index 9a18deb5..5942ecae 100644
--- a/management/templates/smtp-relays.html
+++ b/management/templates/smtp-relays.html
@@ -2,10 +2,14 @@
 </style>
 
 <script>
-	function checklocks() {
+	function checkfields() {
+		let use_relay = document.getElementById("use_relay").checked
 		let use_auth = document.getElementById("relay_use_auth").checked
-		document.getElementById("relay_auth_user").disabled = !use_auth
-		document.getElementById("relay_auth_pass").disabled = !use_auth
+
+		document.getElementById("relay_host").disabled = !use_relay
+		document.getElementById("relay_use_auth").disabled = !use_relay
+		document.getElementById("relay_auth_user").disabled = !use_relay && !use_auth
+		document.getElementById("relay_auth_pass").disabled = !use_relay && !use_auth
 	}
 </script>
 
@@ -22,6 +26,18 @@
 	<form class="form-horizontal" role="form" onsubmit="return false;">
 		<div class="form-group">
 			<table style="width: 600px">
+				<tr>
+					<td>
+						<label for="use_relay" class="col-sm-1 control-label">Use Relay?</label>
+					</td>
+					<td>
+						<div class="col-sm-10">
+							<input type="checkbox" id="use_relay" name="use_relay" value="true"
+								onclick="checkfields();">
+						</div>
+					</td>
+				</tr>
+
 				<tr>
 					<td>
 						<label for="relay_host" class="col-sm-1 control-label">Hostname</label>
@@ -41,7 +57,7 @@
 					<td>
 						<div class="col-sm-10">
 							<input checked type="checkbox" id="relay_use_auth" name="relay_use_auth" value="true"
-								onclick="checklocks();">
+								onclick="checkfields();">
 						</div>
 					</td>
 				</tr>