Features/96 account page

Recommit the Rob's changes about account function and fix the message shown when both addresses are not same.