Adding password confirm fields

Change-Id: Ie0d92b3825dbae3adebcfc4aa4e992e994774ec6