1 files changed, 13 insertions, 3 deletions

diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php
index fdb2186..a6ae2f4 100644
--- a/src/usr/local/www/firewall_virtual_ip_edit.php
+++ b/src/usr/local/www/firewall_virtual_ip_edit.php
@@ -359,7 +359,7 @@ $form = new Form();
 
 $section = new Form_Section('Edit Virtual IP');
 
-$group = new Form_Group('Type');
+$group = new Form_Group('*Type');
 
 $group->add(new Form_Checkbox(
 	'mode',
@@ -397,7 +397,7 @@ $section->add($group);
 
 $section->addInput(new Form_Select(
 	'interface',
-	'Interface',
+	'*Interface',
 	$pconfig['interface'],
 	build_if_list()
 ));
@@ -414,7 +414,7 @@ $section->addInput(new Form_Select(
 
 $section->addInput(new Form_IpAddress(
 	'subnet',
-	'Address(es)',
+	'*Address(es)',
 	$pconfig['subnet']
 ))->addMask('subnet_bits', $pconfig['subnet_bits'])->setHelp('<span id="address_note"></span>');
 
@@ -521,10 +521,14 @@ events.push(function() {
 		disableInput('password', true);
 		disableInput('password_confirm', true);
 		hideCheckbox('noexpand', true);
+		setRequired('password', false);
+		setRequired('vhid', false);
+		setRequired('advbase', false);
 
 		if (mode == 'ipalias') {
 			$('#address_note').html("<?=$ipaliashelp?>");
 			$('#type').val('single');
+			setRequired('type', false);
 			disableInput('subnet_bits', false);
 
 		} else if (mode == 'carp') {
@@ -536,13 +540,19 @@ events.push(function() {
 			disableInput('password_confirm', false);
 			disableInput('subnet_bits', false);
 			$('#type').val('single');
+			setRequired('type', false);
+			setRequired('password', true);
+			setRequired('vhid', true);
+			setRequired('advbase', true);
 		} else if (mode == 'proxyarp') {
 			$('#address_note').html("<?=$proxyarphelp?>");
 			disableInput('type', false);
+			setRequired('type', true);
 			disableInput('subnet_bits', ($('#type').val() == 'single'));
 		} else {
 			$('#address_note').html('');
 			disableInput('type', false);
+			setRequired('type', true);
 			disableInput('subnet_bits', ($('#type').val() == 'single'));
 		}
 	}