Bug Fix "CON-68 Handle password security better"