Bug 2531

https://gist.github.com/artpard/5c24d26bbd252dee9aad
how about case when user is None?