Changed to validate on username rather than email