Added checks for user at the right time