diff --git a/filemin/acl_security.pl b/filemin/acl_security.pl
index 4edeed81f..77b6b64f4 100644
--- a/filemin/acl_security.pl
+++ b/filemin/acl_security.pl
@@ -38,14 +38,14 @@ print &ui_table_row(
 		&ui_help($text{'acl_download_addresses_desc'}),
 	&ui_radio_table(
 		"download_address_mode", $download_address_mode,
-		[ [ 'public', $text{'acl_download_public'} ],
-		  [ 'listed', $text{'acl_download_listed'},
+		[ [ 'all', $text{'acl_download_all'} ],
+		  [ 'public', $text{'acl_download_public'} ],
+		  [ 'listed', $text{'acl_download_listed'}."<br>".
 		    &ui_textarea(
 			"download_allowed_addresses",
 			join("\n", split(/\s+/,
 				$access->{'download_allowed_addresses'})),
-			4, 50) ],
-		  [ 'all', $text{'acl_download_all'} ] ]),
+			4, 50) ] ]),
 	3);
 
 # Run as Unix user
diff --git a/mailboxes/acl_security.pl b/mailboxes/acl_security.pl
index 7cea80edd..e640217f8 100755
--- a/mailboxes/acl_security.pl
+++ b/mailboxes/acl_security.pl
@@ -66,14 +66,14 @@ print &ui_table_row(
 		&ui_help($text{'acl_download_addresses_desc'}),
 	&ui_radio_table(
 		"download_address_mode", $download_address_mode,
-		[ [ 'public', $text{'acl_download_public'} ],
-		  [ 'listed', $text{'acl_download_listed'},
+		[ [ 'all', $text{'acl_download_all'} ],
+		  [ 'public', $text{'acl_download_public'} ],
+		  [ 'listed', $text{'acl_download_listed'}."<br>".
 		    &ui_textarea(
 			"download_allowed_addresses",
 			join("\n", split(/\s+/,
 				$o->{'download_allowed_addresses'})),
-			4, 50) ],
-		  [ 'all', $text{'acl_download_all'} ] ]),
+			4, 50) ] ]),
 	3);
 }
 
diff --git a/updown/acl_security.pl b/updown/acl_security.pl
index e0e350c20..7e589b0c0 100755
--- a/updown/acl_security.pl
+++ b/updown/acl_security.pl
@@ -26,14 +26,14 @@ print &ui_table_row(
 		&ui_help($text{'acl_download_addresses_desc'}),
 	&ui_radio_table(
 		"download_address_mode", $download_address_mode,
-		[ [ 'public', $text{'acl_download_public'} ],
-		  [ 'listed', $text{'acl_download_listed'},
+		[ [ 'all', $text{'acl_download_all'} ],
+		  [ 'public', $text{'acl_download_public'} ],
+		  [ 'listed', $text{'acl_download_listed'}."<br>".
 		    &ui_textarea(
 			"download_allowed_addresses",
 			join("\n", split(/\s+/,
 				$o->{'download_allowed_addresses'})),
-			4, 50) ],
-		  [ 'all', $text{'acl_download_all'} ] ]),
+			4, 50) ] ]),
 	3);
 
 print &ui_table_row($text{'acl_users'},