reset password, add info about users
Merge