Remove passing user object

Remove passing user object. This should fix #353 too.