GAIAEH-269 my account errors plus improvement on MatchaCUP