diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 489680f143..2ec03bbbc5 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -689,20 +689,8 @@ function onAuthMethodChanged() {
     document.iform.tls.disabled = endis;
 
 EOD;
-	if ($mode == 'server') {
-		$javascript .= <<<EOD
-	document.iform.dh_params.dh.disabled = endis;
-	document.iform.crl.crl.disabled = endis;
-	document.iform.tls.disabled = endis;
-	document.iform.nopool.disabled = endis;
-	document.iform.local_network.disabled = endis;
-	document.iform.client2client.disabled = endis;
-	document.iform.maxclients.disabled = endis;
-
-EOD;
-	}
-
-	else { // Client mode
+	if ($mode != 'server') {
+	// Client mode
 		$javascript .= "\tdocument.iform.remote_network.disabled = !endis;\n";
 	}