fixed duplicated user issue