Added links and user validation