Fix login box and clean up email editing