Feature/fix userid