Issue #2065733 by hswong3i: system/connect should keep user mail/init.