merged change password views