Fixed sorting on initial signup