diff --git a/public/main/inc/lib/display.lib.php b/public/main/inc/lib/display.lib.php
index f9505ade7f..e3c67d03dc 100644
--- a/public/main/inc/lib/display.lib.php
+++ b/public/main/inc/lib/display.lib.php
@@ -1204,9 +1204,9 @@ class Display
             $extra_params['rowList'] = $rowList;
         }
 
-        $defaultRow = api_get_setting('platform.table_default_row');
-        if (!empty($defaultRow)) {
-            $obj->rowNum = (int) $defaultRow;
+        $defaultRow = (int) api_get_setting('platform.table_default_row');
+        if ($defaultRow > 0) {
+            $obj->rowNum = $defaultRow;
         }
 
         $json = '';
@@ -1328,6 +1328,7 @@ class Display
         }
         // Creating the jqgrid element.
         $json .= '$("#'.$div_id.'").jqGrid({';
+        $json .= "autowidth: true,";
         //$json .= $beforeSelectRow;
         $json .= $gridComplete;
         $json .= $beforeProcessing;
diff --git a/src/CoreBundle/Settings/PlatformSettingsSchema.php b/src/CoreBundle/Settings/PlatformSettingsSchema.php
index db4b73df97..91a788ce93 100644
--- a/src/CoreBundle/Settings/PlatformSettingsSchema.php
+++ b/src/CoreBundle/Settings/PlatformSettingsSchema.php
@@ -75,7 +75,7 @@ class PlatformSettingsSchema extends AbstractSettingsSchema
                     'pdf_img_dpi' => '96',
                     'tracking_skip_generic_data' => 'false',
                     'hide_complete_name_in_whoisonline' => 'false',
-                    'table_default_row' => '50',
+                    'table_default_row' => '0',
                     'allow_double_validation_in_registration' => 'false',
                     'block_my_progress_page' => 'false',
                     'generate_random_login' => 'false',