Merge "fix N_SE-7712 : fix to show simple password ." into 2.0_beta