Bug fix on current user retrieving