Trying to simplify so that username is not required for future purchases