Fix for internal users without SFDC user
Fix pagination