Index: kernel-impl/src/main/java/org/sakaiproject/user/impl/BaseUserDirectoryService.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/user/impl/BaseUserDirectoryService.java   (revision 66046)
+++ kernel-impl/src/main/java/org/sakaiproject/user/impl/BaseUserDirectoryService.java   (working copy)
@@ -618,6 +624,7 @@
                         // check with the provider
                         if (m_provider.getUser(user))
                         {
+                                user.setEid(cleanEid(user.getEid()));
                                 ensureMappedIdForProvidedUser(user);
                                 return user;
                         }
@@ -634,6 +641,7 @@
         {
                 if (user.getId() == null)
                 {
+                        user.setEid(cleanEid(user.getEid()));
                         String eid = user.getEid();
                         String id = assureUuid(null, eid);
                         m_storage.putMap(id, eid);
@@ -645,6 +653,7 @@
         {
                 if (user.getId() == null)
                 {
+                        user.setEid(cleanEid(user.getEid()));
                         user.setId(m_storage.checkMapForId(user.getEid()));
                         ensureMappedIdForProvidedUser(user);
                 }