fixed: 1. server confidential 2. unchanged username and password on review page.

Change-Id: Iaa60fa5c599196efd0d092f846b0d7f0c09eb785
Merge "fixed: 1. server confidential 2. unchanged username and password on review page."