fix issues with clean password