Fixed the user info stuff Will broke.  Need to redo the coniditonal though