Hotfix for failure on user
Merge pull request #1173 from davidhurley/hotfix-1

Hotfix for failure on user.
Tks.