Re-ordered columns
Added some error checking for invalid users