diff --git a/proftpd/create_dirlimit.cgi b/proftpd/create_dirlimit.cgi
new file mode 100644
index 000000000..00ea1c3db
--- /dev/null
+++ b/proftpd/create_dirlimit.cgi
@@ -0,0 +1,13 @@
+#!/usr/local/bin/perl
+# Redirect to either create_dir or create_limit
+
+require './proftpd-lib.pl';
+&ReadParse();
+if ($in{'mode'} == 0) {
+	&redirect("create_dir.cgi?global=".&urlize($in{'global'}).
+		  "&dir=".&urlize($in{'dir'}));
+	}
+else {
+	&redirect("create_limit.cgi?global=".&urlize($in{'global'}).
+		  "&cmd=".&urlize($in{'cmd'}));
+	}
diff --git a/proftpd/index.cgi b/proftpd/index.cgi
index 04fa414c0..14d277c03 100755
--- a/proftpd/index.cgi
+++ b/proftpd/index.cgi
@@ -115,33 +115,21 @@ if (@dir) {
 		}
 	&icons_table(\@links, \@titles, \@icons, 3);
 	}
+print "<p>\n";
 
-print "<table width=100%><tr><td>\n";
+print &ui_form_start("create_dirlimit.cgi", "post");
+print &ui_hidden("global", 1);
+print &ui_table_start($text{'index_dlheader'}, undef, 2);
 
-print "<form action=create_dir.cgi>\n";
-print "<input type=hidden name=global value=1>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'virt_adddir'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
-print "<tr> <td><b>$text{'virt_path'}</b></td>\n";
-print "<td><input name=dir size=30>\n";
-print "<input type=submit value=\"$text{'create'}\"></td> </tr>\n";
-print "</table></td></tr></table></form>\n";
-
-print "</td><td>\n";
-
-print "<form action=create_limit.cgi>\n";
-print "<input type=hidden name=global value=1>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'virt_addlimit'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
-print "<tr> <td><b>$text{'virt_cmds'}</b></td>\n";
-print "<td><input name=cmd size=20>\n";
-print "<input type=submit value=\"$text{'create'}\"></td> </tr>\n";
-print "</table></td></tr></table></form>\n";
-
-print "</td></tr></table>\n";
+print &ui_table_row($text{'index_dlmode'},
+	&ui_radio_table("mode", 0,
+		[ [ 0, $text{'virt_path'},
+		    &ui_textbox("dir", undef, 50) ],
+		  [ 1, $text{'virt_cmds'},
+		    &ui_textbox("cmd", undef, 30) ] ]));
 
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'create'} ] ]);
 
 # Start virtual server list with default
 push(@vname, $text{'index_defserv'});
diff --git a/proftpd/lang/en b/proftpd/lang/en
index 6111a54bd..847216d68 100644
--- a/proftpd/lang/en
+++ b/proftpd/lang/en
@@ -27,6 +27,8 @@ index_global=Global Configuration
 index_create=Create virtual server
 index_version=ProFTPd version $1
 index_proftpd=ProFTPd
+index_dlheader=Add Options
+index_dlmode=Add options for
 
 efailed=Failed to save $1