Implemented work around for un persisted passwords