Added ability to change email address, fixed issue with account manage form