Reorder and Bugfixes
Fix bux where a user registered user can't be found