s[42] : user claim modification

#174 @KareemWahby @naderdavid @moh-essam