[MERGE] res_user rework mostly email from user instead of address