diff --git a/xCAT-UI/js/zUtils.js b/xCAT-UI/js/zUtils.js
index 38d56fa2e..23aafd3b1 100644
--- a/xCAT-UI/js/zUtils.js
+++ b/xCAT-UI/js/zUtils.js
@@ -105,7 +105,7 @@ function loadZProvisionPage(tabId) {
 	statBar.append(loader);
 
 	// Create info bar
-	var infoBar = createInfoBar('Provision z/VM node(s)');
+	var infoBar = createInfoBar('Provision a zVM node');
 	provForm.append(infoBar);
 
 	// Append to provision tab
diff --git a/xCAT-client/share/doc/xCAT2onzVM.odt b/xCAT-client/share/doc/xCAT2onzVM.odt
index 2dab46539..55148be49 100644
Binary files a/xCAT-client/share/doc/xCAT2onzVM.odt and b/xCAT-client/share/doc/xCAT2onzVM.odt differ
diff --git a/xCAT-client/share/doc/xCAT2onzVM.pdf b/xCAT-client/share/doc/xCAT2onzVM.pdf
index 599ee8abe..d138701dd 100644
Binary files a/xCAT-client/share/doc/xCAT2onzVM.pdf and b/xCAT-client/share/doc/xCAT2onzVM.pdf differ
diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index 7aa183095..1c561026b 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -1545,6 +1545,17 @@ sub makeVM {
 		my $rc = xCAT::zvmUtils->checkOutput( $callback, $out );
 		if ( $rc == 0 ) {
 
+			# Get VSwitch of HCP
+			my @vswId = xCAT::zvmCPUtils->getVswitchId($hcp);
+
+			# Grant access to VSwitch for Linux user
+			# GuestLan do not need permissions
+			foreach (@vswId) {
+				xCAT::zvmUtils->printLn( $callback, "$node: Granting VSwitch ($_) access for $userId" );
+				$out = xCAT::zvmCPUtils->grantVSwitch( $callback, $hcp, $userId, $_ );
+				xCAT::zvmUtils->printLn( $callback, "$node: $out" );
+			}
+
 			# Get HCP MAC address
 			# The HCP should only have (1) network -- (1) MAC address
 			xCAT::zvmCPUtils->loadVmcp($hcp);
@@ -2710,11 +2721,11 @@ sub nodeSet {
 
 		# Get broadcast address of NIC
 		my $ifcfg = xCAT::zvmUtils->getIfcfgByNic( $hcp, $readChannel );
-		$out = `cat $ifcfg | grep "BROADCAST"`;
+		$out = `ssh $hcp "cat $ifcfg" | grep "BROADCAST"`;
 		@words = split( '=', $out );
 		my $broadcast = $words[1];
 		$broadcast = xCAT::zvmUtils->trimStr($broadcast);
-		$broadcast = xCAT::zvmUtils->replaceStr( $broadcast, "'", "" );
+		$broadcast =~ s;"|';;g;
 
 		# Load VMCP module on HCP
 		xCAT::zvmCPUtils->loadVmcp($hcp);