fixed password issue in DB
merge fix