diff --git a/Set-ComputerName.ps1 b/Set-ComputerName.ps1
index 376f13b..eb91ad0 100755
--- a/Set-ComputerName.ps1
+++ b/Set-ComputerName.ps1
@@ -32,10 +32,27 @@ Write-Host "Waiting for RPC Service"
 # rename computer and join to domain
 Write-Host "Computer will be renamed to $NewComputerName."
 Rename-Computer -NewName $NewComputerName -Force -Verbose
-Add-Computer -Force -DomainName sawtooth.claremontmakerspace.org -Options JoinWithNewName -Credential $cred
-#Start-Sleep -Seconds 5
-#Restart-Computer
+
+Write-Host "Waiting for RPC Service"
+(Get-Service RpcSs).WaitForStatus("Running")
+
+While($True){
+    try{
+        Write-Host "Trying to Domain Join"
+        Add-Computer -ErrorAction Stop -Force -DomainName sawtooth.claremontmakerspace.org -Options JoinWithNewName,InstallInvoke -Credential $cred
+        break
+    }
+    catch{
+        Write-Host $_
+        Start-Sleep -Seconds 1 # wait for a seconds before next attempt.
+    }
+}
 
 # Install Salt
 # Write-Host "Installing Salt with minion name: $NewComputerName."
 # \\ucs\Software\Salt-Minion-2019.2.2-Py3-AMD64-Setup.exe /S /minion-name="$NewComputerName"
+
+
+#Read-Host -Prompt "Press Enter to reboot"
+#Start-Sleep -Seconds 30
+#Restart-Computer
diff --git a/autounattend.xml b/autounattend.xml
index e03baca..a59e4dd 100755
--- a/autounattend.xml
+++ b/autounattend.xml
@@ -159,7 +159,7 @@
             </AutoLogon>
             <FirstLogonCommands>
               <SynchronousCommand wcm:action="add">
-                <CommandLine>net use \\ucs\software /user:DomainJoin REPLACE_WITH_PASSWORD</CommandLine>
+                <CommandLine>net use \\ucs.sawtooth.claremontmakerspace.org\software /user:SAWTOOTH\Administrator REPLACE_WITH_PASSWORD</CommandLine>
                 <Description>Set Up UCS Share</Description>
                 <Order>1</Order>
               </SynchronousCommand>