Added check for the user to exist