Fixing user parsing