1.66 Improve user module experience