fix cms bug
fix cms bug
Merge branch 'fix-cms-bug' into send-register-email