Moving around, fixed email null error