Changed the conditions to verify if the first caracter is @