Index: univention-join
===================================================================
--- univention-join	(Revision 73053)
+++ univention-join	(Arbeitskopie)
@@ -879,10 +879,18 @@
 
 	set_kerberos_realm "$DCPWD" "$DCACCOUNT" "$DCNAME" "$REALM"
 	set_windows_domain "$DCPWD" "$DCACCOUNT" "$DCNAME" "$WINDOM"
+	eval "$(univention-config-registry shell)"
+
 	touch /var/univention-join/joined
 	ln -sf /var/univention-join/joined /usr/share/univention-join/.joined
 
-	check_and_configure_ad_member_mode
+	if [ -n "$docker_container_uuid" ] && [ -z "$system_setup_boot_installer" ];
+		# We are running an container that is configured as appbox
+		# so don't configure ad member mode
+		:
+	else
+		check_and_configure_ad_member_mode
+	fi
 	run_join_scripts
 
 else