Follow-up from "Set default PAT expiration to 365 days from now"

The following discussions from !120213 (merged) should be addressed:

Edited by Jessie Young