Merge pull request #1597 from tomhughes/current-user