diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 08e067352..aadd5ef8f 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -12,16 +12,10 @@ foreach ($menu as $item) {
 	if ((substr($self, -10) == substr($item[2], -10) && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
     
 	if ($user_level >= $item[1]) {
-		if (
-				('upload.php' == $item[2] && 
-				 get_settings('use_fileupload') && 
-				 ($user_level >= get_settings('fileupload_minlevel'))
-				 ) || 'upload.php' != $item[2]) {
-			if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}"))
-				echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";			
-			else
-				echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
-		}
+		if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
+			echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";			
+		else
+			echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
 	}
 }
 
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 0aec209a4..ffa6daf7f 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -12,7 +12,8 @@ $menu[25] = array(__('Users'), 0, 'profile.php');
 $menu[30] = array(__('Options'), 6, 'options-general.php');
 $menu[35] = array(__('Plugins'), 8, 'plugins.php');
 $menu[40] = array(__('Presentation'), 8, 'themes.php');
-$menu[45] = array(__('Upload'), get_settings('fileupload_minlevel'), 'upload.php');
+if ( get_option('use_fileupload') )
+	$menu[45] = array(__('Upload'), get_settings('fileupload_minlevel'), 'upload.php');
 
 $submenu['post.php'][5] = array(__('Write Post'), 1, 'post.php');
 $submenu['post.php'][10] = array(__('Write Page'), 5, 'page-new.php');