Feature/user id bug fix