diff --git a/dav/dav/src/java/org/sakaiproject/dav/DavServlet.java b/dav/dav/src/java/org/sakaiproject/dav/DavServlet.java
index aed201c6c1ef..7b6532ab7813 100644
--- a/dav/dav/src/java/org/sakaiproject/dav/DavServlet.java
+++ b/dav/dav/src/java/org/sakaiproject/dav/DavServlet.java
@@ -1998,19 +1998,20 @@ else if (idx.startsWith("/") && !idx.endsWith("/") && idx.length() > 2)
 		if(parts.length == 4 && parts[1].equals("group-user")){
 			try
 			{
-				// if successful, the context is already a valid user EID
-				UserDirectoryService.getUserByEid(parts[3]);
+				// try using it as an ID
+				resourceName = UserDirectoryService.getUserEid(parts[3]);
 			}
 			catch (UserNotDefinedException tryId)
 			{
 				try
 				{
-					// try using it as an ID
-					resourceName = UserDirectoryService.getUserEid(parts[3]);
+					// if successful, the context is already a valid user EID
+					UserDirectoryService.getUserByEid(parts[3]);
 				}
 				catch (UserNotDefinedException notId)
 				{
 					// if context was not a valid ID, leave it alone
+					M_log.warn("getResourceNameSAKAI could not find either id or eid: " + parts[3]);
 				}
 			}
 		 }