Bug fix - user not set