template rename and option fix
add password match validation