Index: wp-admin/custom-background.php
===================================================================
--- wp-admin/custom-background.php	(revision 13581)
+++ wp-admin/custom-background.php	(working copy)
@@ -162,7 +162,7 @@
 	 */
 	function js() {
 		$step = $this->step();
-		if ( 1 == $step )
+		if ( 1 == $step && get_background_image())
 			$this->js_1();
 	}
 
Index: wp-admin/custom-header.php
===================================================================
--- wp-admin/custom-header.php	(revision 13581)
+++ wp-admin/custom-header.php	(working copy)
@@ -214,7 +214,7 @@
 	 */
 	function js() {
 		$step = $this->step();
-		if ( 1 == $step )
+		if ( 1 == $step && !get_theme_mod('header_image') && !empty($this->default_headers) )
 			$this->js_1();
 		elseif ( 2 == $step )
 			$this->js_2();