Enchanced security and usability