Pad security fix and better usability