Latest changes merged to jsp version of account page