diff --git a/install.php b/install.php
index 48cc2126d20f617efd08d37a9dae465e023728fb..3f89b66615ca86a11e178048a90224322b331efa 100644
--- a/install.php
+++ b/install.php
@@ -1405,7 +1405,9 @@ function install_finished(&$install_state) {
     $messages = drupal_set_message();
     $output = '<p>' . st('Congratulations, @drupal has been successfully installed.', array('@drupal' => drupal_install_profile_name())) . '</p>';
     $output .= '<p>' . (isset($messages['error']) ? st('Please review the messages above before continuing on to <a href="@url">your new site</a>.', array('@url' => url(''))) : st('You may now visit <a href="@url">your new site</a>.', array('@url' => url('')))) . '</p>';
-    $output .= '<p>' . st('For more information on configuring Drupal, please refer to the <a href="@help">help section</a>.', array('@help' => url('admin/help'))) . '</p>';
+    if (module_exists('help')) {
+      $output .= '<p>' . st('For more information on configuring Drupal, please refer to the <a href="@help">help section</a>.', array('@help' => url('admin/help'))) . '</p>';
+    }
 
     // Rebuild menu and registry to get content type links registered by the
     // profile, and possibly any other menu items created through the tasks.
diff --git a/modules/node/node.module b/modules/node/node.module
index 40023b9af65633c6517d3b15f7015731974636fe..ecc22b91a447e6074fabfd25cf22bc1482448ebd 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1986,11 +1986,14 @@ function node_page_default() {
 
     $default_message = '<p>' . t('No front page content has been created yet.') . '</p>';
 
-    if (user_access('access administration pages')) {
-      $default_links = array (
-        l(t('Create content'), 'node/add'),
-        l(t('Change the default front page'), 'admin/settings/site-information'),
-      );
+    $default_links = array();
+    if (_node_add_access()) {
+      $default_links[] = l(t('Create content'), 'node/add');
+    }
+    if (user_access('administer site configuration')) {
+      $default_links[] = l(t('Change the default front page'), 'admin/settings/site-information');
+    }
+    if (!empty($default_links)) {
       $default_message .= theme('item_list', $default_links);
     }