text fix
fix password confirmation
Merge branch 'hotfix_text_fix' into develop