fix user valir password
Merge branch 'develop' into basic_search