admin	part
merging change of user dao