Fixes in add user/reset password