Fixed update users -- much shorter and simpler