--- debian/univention-system-setup-boot.init	(Revision 53068)
+++ debian/univention-system-setup-boot.init	(Arbeitskopie)
@@ -61,12 +61,6 @@ 
 			if ! grep -q "$key" /root/.ssh/authorized_keys; then
 				echo "$key"  >>/root/.ssh/authorized_keys
 			fi
-			
-			# Show welcome page on unjoined EC2 systems:
-			if [ ! -e /var/univention-join/joined ]; then
-				ucr set apache2/startsite="ucs-overview/initialsetup.html"
-				invoke-rc.d apache2 reload
-			fi
 		fi
 
 		if is_ucr_true server/amazon && is_ucr_true system/setup/boot/networking; then
--- etc/init.d/univention-system-setup-boot-prepare	(Revision 53068)
+++ etc/init.d/univention-system-setup-boot-prepare	(Arbeitskopie)
@@ -50,6 +50,14 @@ 
 		# recreate ssl certificates if they are missing
 		[ ! -d /etc/univention/ssl ] && dpkg-reconfigure univention-ssl
 
+		# Show welcome page on unjoined EC2 systems:
+		if is_ucr_true server/amazon; then
+			if [ ! -e /var/univention-join/joined ]; then
+				ucr set apache2/startsite="ucs-overview/initialsetup.html"
+				invoke-rc.d apache2 reload
+			fi
+		fi
+
 		log_action_end_msg 0
 		;;
 	stop)