added check for already activated user