Fix email issue + upload to new sub domain

Completed