updated id/password validity checking, changed references to email