Quick fix. Need to check for email