fix password safe error
Merged 'dev'.
Finish dev-actual-with-bug