Working on pwd envryption/upgrade