2.3.1

incremental changes
added some fixes to password and recovery