Revert "user + email"

This reverts commit 378e4df74f65e47ca032efa84845c13ec21f043c.