Bug fix: 1. Option number disorder, 2. email space