Dc/Melanie | #2527 |Adding check for anonymous user