C4 salma amr ahmed #42 user claim

@naderdavid , @KareemWahby , @moh-essam Please review and merge :)