Use content filter on the post that is password-protected

Actually you just need to return $content, not the form.

function change_client_post_type($content) {
 if(post_password_required()):
    return $content; //solution
 else: 
    ...content
 endif;

 return $content;

}