make sure there's a user on the upload (bug 844953-fixes)
Merge pull request #2559 from andymckay/1066356-fixes

make sure there's a user on the upload (bug 1066356-fixes)