diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index aa2f98f..b156c52 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -1486,18 +1486,24 @@ function system_site_information_settings() {
   );
   $form['front_page']['site_frontpage'] = array(
     '#type' => 'textfield',
-    '#title' => t('Default front page'),
-    '#default_value' => (variable_get('site_frontpage')!='node'?drupal_get_path_alias(variable_get('site_frontpage', 'node')):''),
+    '#title' => t('Path'),
+    '#default_value' => drupal_get_path_alias(variable_get('site_frontpage', 'node')),
     '#size' => 40,
-    '#description' => t('Optionally, specify a relative URL to display as the front page.  Leave blank to display the default content feed.'),
+    '#description' => t('Specify a relative URL to display as the front page.'),
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
   );
   $form['front_page']['default_nodes_main'] = array(
     '#type' => 'select', '#title' => t('Number of posts on front page'),
     '#default_value' => variable_get('default_nodes_main', 10),
     '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
-    '#description' => t('The maximum number of posts displayed on overview pages such as the front page.'),
-    '#access' => (variable_get('site_frontpage')=='node'),
+    '#description' => t('The maximum number of posts displayed on the front page.'),
+    '#states' => array(
+      'visible' => array (
+        ':input[name="site_frontpage"]' => array(
+          'value' => 'node',
+        )
+      )
+    ),
   );  
   $form['error_page'] = array(
     '#type' => 'fieldset',