fixed multiple users issue