diff --git a/NetBoot/netbootInstall.sh b/NetBoot/netbootInstall.sh
index 26a0f7a..da3ec38 100644
--- a/NetBoot/netbootInstall.sh
+++ b/NetBoot/netbootInstall.sh
@@ -219,16 +219,21 @@ fi
 # Configure tftp
 if [ -f "/etc/default/tftpd-hpa" ]; then
 	sed -i 's:/var/lib/tftpboot:/srv/NetBoot/NetBootSP0:' /etc/default/tftpd-hpa
+	sed -i 's:TFTP_OPTIONS=.*:TFTP_OPTIONS="--secure --blocksize 1460":' /etc/default/tftpd-hpa
 fi
 if [ -f "/etc/xinetd.d/tftp" ]; then
 	sed -i 's:/var/lib/tftpboot:/srv/NetBoot/NetBootSP0:' /etc/xinetd.d/tftp
+	sed -i '/server_args/ s/= -s/= --blocksize 1460 -s/' /etc/xinetd.d/tftp
 	sed -i '/disable/ s/yes/no/' /etc/xinetd.d/tftp
 fi
 if [ -f "/usr/lib/systemd/system/tftp.service" ]; then
-	sed -i 's:/var/lib/tftpboot:/srv/NetBoot/NetBootSP0:' /usr/lib/systemd/system/tftp.service
+	sed -i 's:ExecStart=.*:ExecStart=/usr/sbin/in.tftpd --blocksize 1460 -s /srv/NetBoot/NetBootSP0:' /usr/lib/systemd/system/tftp.service
 fi
 if [ -f "/lib/systemd/system/tftp.service" ]; then
-	sed -i 's:/var/lib/tftpboot:/srv/NetBoot/NetBootSP0:' /lib/systemd/system/tftp.service
+	sed -i 's:ExecStart=.*:ExecStart=/usr/sbin/in.tftpd --blocksize 1460 -s /srv/NetBoot/NetBootSP0:' /lib/systemd/system/tftp.service
+fi
+if [ -f "/usr/lib/systemd/system/tftp.service" ] || [ -f "/lib/systemd/system/tftp.service" ]; then
+	systemctl daemon-reload
 fi
 
 # Create netboot directories
diff --git a/SUS/susInstall.sh b/SUS/susInstall.sh
index c26e400..030d5e3 100644
--- a/SUS/susInstall.sh
+++ b/SUS/susInstall.sh
@@ -108,6 +108,8 @@ if [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then
 		RewriteRule ^/index\.sucatalog$ http://%{HTTP_HOST}/index-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
 		RewriteCond %{HTTP_USER_AGENT} Darwin/16
 		RewriteRule ^/index\.sucatalog$ http://%{HTTP_HOST}/index-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
+		RewriteCond %{HTTP_USER_AGENT} Darwin/17
+		RewriteRule ^/index\.sucatalog$ http://%{HTTP_HOST}/index-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
 	</IfModule>
 
 </VirtualHost>
@@ -140,6 +142,8 @@ if [ -f "/etc/httpd/conf/httpd.conf" ]; then
 		RewriteRule ^/index\.sucatalog$ http://%{HTTP_HOST}/index-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
 		RewriteCond %{HTTP_USER_AGENT} Darwin/16
 		RewriteRule ^/index\.sucatalog$ http://%{HTTP_HOST}/index-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
+		RewriteCond %{HTTP_USER_AGENT} Darwin/17
+		RewriteRule ^/index\.sucatalog$ http://%{HTTP_HOST}/index-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
 	</IfModule>
 ZHEREDOC
 	# Remove empty <IfModule mod_rewrite.c> sections
diff --git a/SUS/var/lib/reposado/reposadolib/reposadocommon.py b/SUS/var/lib/reposado/reposadolib/reposadocommon.py
index 662c29c..3643c19 100755
--- a/SUS/var/lib/reposado/reposadolib/reposadocommon.py
+++ b/SUS/var/lib/reposado/reposadolib/reposadocommon.py
@@ -91,7 +91,10 @@ def pref(prefname):
              '.merged-1.sucatalog'),
             ('https://swscan.apple.com/content/catalogs/others/'
              'index-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-'
-             'leopard.merged-1.sucatalog')
+             'leopard.merged-1.sucatalog'),
+            ('https://swscan.apple.com/content/catalogs/others/'
+             'index-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-'
+             'leopard.merged-1.sucatalog'),
         ],
         'PreferredLocalizations': ['English', 'en'],
         'CurlPath': '/usr/bin/curl'
diff --git a/docs/sus.md b/docs/sus.md
index 7570702..71960aa 100755
--- a/docs/sus.md
+++ b/docs/sus.md
@@ -129,6 +129,10 @@ Branch URLs vary depending on the operating system of enrolled computers. Exampl
 
 	http://sus.mycompany.corp/content/catalogs/others/index-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1_<Branch Name>.sucatalog
 	
+**macOS v10.13**
+
+	http://sus.mycompany.corp/content/catalogs/others/index-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1_<Branch Name>.sucatalog
+	
 ### Running Software Update on Computers
 
 For instructions on using the Casper Suite to run Software Update on computers that are managed by the JSS, see the “Running Software Update” section in the Casper Suite Administrator’s Guide.
diff --git a/webadmin/var/www/webadmin/AFP.php b/webadmin/var/www/webadmin/AFP.php
index 64ecea2..cd48116 100755
--- a/webadmin/var/www/webadmin/AFP.php
+++ b/webadmin/var/www/webadmin/AFP.php
@@ -118,6 +118,8 @@ function validateafpPW()
 			<br><br>
 			-->
 
+			<span class="label label-default">AFP Password</span>
+
 			<label class="control-label">New Password</label>
 			<input type="password" placeholder="Required" name="afppass1" id="afppass1" class="form-control input-sm" value="" onClick="validateafpPW();" onKeyUp="validateafpPW();" onChange="validateafpPW();" />
 
diff --git a/webadmin/var/www/webadmin/SMB.php b/webadmin/var/www/webadmin/SMB.php
index 1abde70..92ec611 100644
--- a/webadmin/var/www/webadmin/SMB.php
+++ b/webadmin/var/www/webadmin/SMB.php
@@ -113,6 +113,8 @@ function validatePW()
 			<br><br>
 			-->
 
+			<span class="label label-default">SMB Password</span>
+
 			<label class="control-label">New Password</label>
 			<input type="password" placeholder="Required" name="smbpass1" id="smbpass1" class="form-control input-sm" value="" onClick="validatePW();" onKeyUp="validatePW();" onChange="validatePW();" />
 
diff --git a/webadmin/var/www/webadmin/inc/header.php b/webadmin/var/www/webadmin/inc/header.php
index 73c4258..c52e102 100644
--- a/webadmin/var/www/webadmin/inc/header.php
+++ b/webadmin/var/www/webadmin/inc/header.php
@@ -48,7 +48,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a id="version-number-text" class="navbar-brand text-muted">NetSUS 4.2.0</a>
+                <a id="version-number-text" class="navbar-brand text-muted">NetSUS 4.2.1</a>
             </div>
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav navbar-right">
diff --git a/webadmin/webadminInstall.sh b/webadmin/webadminInstall.sh
index 6e51a5c..98307d3 100755
--- a/webadmin/webadminInstall.sh
+++ b/webadmin/webadminInstall.sh
@@ -89,7 +89,7 @@ if [ -f "/etc/ntp/step-tickers" ]; then
 		echo $currentTimeServer >> /etc/ntp/step-tickers
 	fi
 else
-	currentTimeServer=$(cat /etc/cron.daily/ntpdate 2>/dev/null | awk '{print $2}')
+	currentTimeServer=$(cat /etc/cron.daily/ntpdate 2>/dev/null | awk '{print $NF}')
 	if [[ $currentTimeServer == "" ]]; then
 		echo "server 0.ubuntu.pool.ntp.org" > /etc/cron.daily/ntpdate
 	fi
@@ -141,8 +141,13 @@ if [ ! -f "/var/appliance/conf/appliance.conf.xml" ]; then
 	if [[ $shelluser == "" ]] || [[ $shelluser == "root" ]]; then
 		shelluser=shelluser
 		if [[ $(getent passwd shelluser) == "" ]]; then
-			useradd -c 'shelluser' -d /home/shelluser -G wheel -m -s /bin/bash shelluser
-			sed -i '/NOPASSWD/!s/.*%wheel/%wheel/' /etc/sudoers
+			if [[ $(getent group wheel) == "" ]]; then
+				groupadd shelluser
+				useradd -d /home/shelluser -g shelluser -G adm,cdrom,sudo,dip,plugdev,lpadmin,sambashare -m -s /bin/bash shelluser
+			else
+				useradd -c 'shelluser' -d /home/shelluser -G wheel -m -s /bin/bash shelluser
+				sed -i '/NOPASSWD/!s/.*%wheel/%wheel/' /etc/sudoers
+			fi
 		fi
 	fi
 	mkdir -p /var/appliance/conf/