updated to use username not email