} // END - if
// Are we in 'welcome' page and are there jobs to be done?
-if ($GLOBALS['action'] != "login") {
+if (!ifAdminMenuHasEntries($GLOBALS['action'])) {
// This menu is empty and so no content is displayed
LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), $GLOBALS['action']));
} elseif ($jobsDone === true) {