Fixing user assignment bug