diff --git a/Horizon Tools/KISHorizon.psm1 b/Horizon Tools/KISHorizon.psm1
index 89429cf..0f35691 100644
--- a/Horizon Tools/KISHorizon.psm1	
+++ b/Horizon Tools/KISHorizon.psm1	
@@ -574,6 +574,8 @@ Function Get-HorizonADUser {
 	
 	if ($global:kishorizondebug) {
 		Write-Host $MyInvocation.MyCommand.Name Starting
+		Write-Host User: $Name
+		Write-Host Domain: $Domain
 	}
 
 	try {
@@ -701,7 +703,11 @@ function Grant-HorizonDesktop {
 		}
 	}
 	$nameparts = $UserUPN.split("\")
-	$UserID = (Get-HorizonAdUser -Horizon $Horizon -Name $nameparts[0] -domain $nameparts[1]).id
+	if ($nameparts.Count -gt 1) {
+		$UserID = (Get-HorizonAdUser -Horizon $Horizon -Name $nameparts[0] -domain $nameparts[1]).id
+	} else {
+		$UserID = (Get-HorizonAdUser -Horizon $Horizon -Name $UseUPN).id
+	}
 	if ($global:kishorizondebug) {
 		Write-Host UserID: $UserID
 	}