changes some current_user logic to use model method