Resolve User data leak for non members #2580