C1 abdelrahman wishlist

@BeshoSmile please review the code i handled the error of the anoynmous user