Fix user password/email issues