fixed password change template and controller
merge fix