Clean up rank logic in UserCtrl