User and Scholarship controller updates