Updated so it works when users are moved