success message for emailaddress editing and some small code changes