Fixes #1514
Fixes bug with hardcoded user id