Fix for bug 949064 - Handling case where the user is not present

[merge]