diff --git a/mysql/edit_user.cgi b/mysql/edit_user.cgi
index 71a5c74f0..e2adca34e 100755
--- a/mysql/edit_user.cgi
+++ b/mysql/edit_user.cgi
@@ -24,59 +24,48 @@ else {
 		}
 	}
 
-print "<form action=save_user.cgi>\n";
+# Form header
+print &ui_form_start("save_user.cgi", "post");
 if ($in{'new'}) {
-	print "<input type=hidden name=new value=1>\n";
+	print &ui_hidden("new", 1);
 	}
 else {
-	print "<input type=hidden name=olduser value='$u->[1]'>\n";
-	print "<input type=hidden name=oldhost value='$u->[0]'>\n";
+	print &ui_hidden("olduser", $u->[1]);
+	print &ui_hidden("oldhost", $u->[0]);
 	}
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'user_header'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
+print &ui_table_start($text{'user_header'}, undef, 2);
+%sizes = &table_field_sizes($master_db, "user");
 
-print "<tr> <td><b>$text{'user_user'}</b></td> <td>\n";
-printf "<input type=radio name=mysqluser_def value=1 %s> %s\n",
-	$u->[1] ? '' : 'checked', $text{'user_all'};
-printf "<input type=radio name=mysqluser_def value=0 %s>\n",
-	$u->[1] ? 'checked' : '';
-print "<input name=mysqluser size=20 value='$u->[1]'></td> </tr>\n";
+# Username field
+print &ui_table_row($text{'user_user'},
+	&ui_opt_textbox("mysqluser", $u->[1], $sizes{'user'},
+			$text{'user_all'}));
 
-print "<tr> <td><b>$text{'user_pass'}</b></td> <td>\n";
-printf "<input type=radio name=mysqlpass_mode value=2 %s> %s\n",
-	!$in{'new'} && !$u->[2] ? 'checked' : '', $text{'user_none'};
-if (!$in{'new'}) {
-	printf "<input type=radio name=mysqlpass_mode value=1 %s> %s\n",
-		$u->[2] ? 'checked' : '', $text{'user_leave'};
-	}
-printf "<input type=radio name=mysqlpass_mode value=0 %s> %s\n",
-	$in{'new'} ? 'checked' : '', $text{'user_set'};
-print "<input name=mysqlpass type=password size=20></td> </tr>\n";
+# Password field
+print &ui_table_row($text{'user_pass'},
+	&ui_radio("mysqlpass_mode", $in{'new'} ? 0 : $u->[2] ? 1 : 2,
+		  [ [ 2, $text{'user_none'} ],
+		    $in{'new'} ? ( ) : ( [ 1, $text{'user_leave'} ] ),
+		    [ 0, $text{'user_set'} ] ])." ".
+	&ui_password("mysqlpass", undef, 20));
 
-print "<tr> <td><b>$text{'user_host'}</b></td> <td>\n";
-printf "<input type=radio name=host_def value=1 %s> %s\n",
-	$u->[0] eq '%' || $u->[0] eq '' ? 'checked' : '', $text{'user_any'};
-printf "<input type=radio name=host_def value=0 %s>\n",
-	$u->[0] eq '%' || $u->[0] eq '' ? '' : 'checked';
-printf "<input name=host size=40 value='%s'></td> </tr>\n",
-	$u->[0] eq '%' ? '' : $u->[0];
+# Allowed host / network
+print &ui_table_row($text{'user_host'},
+	&ui_opt_textbox("host", $u->[0] eq '%' ? '' : $u->[0], 40,
+			$text{'user_any'}));
 
-print "<tr> <td valign=top><b>$text{'user_perms'}</b></td>\n";
-print "<td><select name=perms multiple size=10>\n";
+# User's permissions
 for($i=3; $i<=&user_priv_cols()+3-1; $i++) {
-	printf "<option value=%d %s>%s\n",
-		$i, $u->[$i] eq 'Y' ? 'selected' : '',
-		$text{"user_priv$i"};
+	push(@opts, [ $i, $text{"user_priv$i"} ]);
+	push(@sel, $i) if ($u->[$i] eq 'Y');
 	}
-print "</select></td> </tr>\n";
+print &ui_table_row($text{'user_perms'},
+	&ui_select("perms", \@sel, \@opts, 10, 1, 1));
 
-print "</table></td></tr></table>\n";
-print "<input type=submit value='$text{'save'}'>\n";
-if (!$in{'new'}) {
-	print "<input type=submit name=delete value='$text{'delete'}'>\n";
-	}
-print "</form>\n";
+print &ui_table_end();
+print &ui_form_end([ $in{'new'} ? ( [ undef, $text{'create'} ] )
+				: ( [ undef, $text{'save'} ],
+				    [ 'delete', $text{'delete'} ] ) ]);
 
 &ui_print_footer('list_users.cgi', $text{'users_return'},
 	"", $text{'index_return'});
diff --git a/mysql/index.cgi b/mysql/index.cgi
index baa7d8d72..369baae6e 100755
--- a/mysql/index.cgi
+++ b/mysql/index.cgi
@@ -80,19 +80,19 @@ elsif ($r == -1) {
 	# Running, but webmin doesn't know the root (or user's) password!
 	&main_header();
 	print "<b>$text{'index_nopass'}</b> <p>\n";
-	print "<form action=login.cgi method=post>\n";
-	print "<center><table border>\n";
-	print "<tr $tb> <td><b>$text{'index_ltitle'}</b></td> </tr>\n";
-	print "<tr $cb> <td><table cellpadding=2>\n";
-	print "<tr> <td><b>$text{'index_login'}</b></td>\n";
-	printf "<td><input name=login size=20 value='%s'></td> </tr>\n",
-		$access{'user'} || $config{'login'};
-	print "<tr> <td><b>$text{'index_pass'}</b></td>\n";
-	print "<td><input name=pass size=20 type=password></td>\n";
-	print "</tr> </table></td></tr></table>\n";
-	print "<input type=submit value='$text{'save'}'>\n";
-	print "<input type=reset value='$text{'index_clear'}'>\n";
-	print "</center></form>\n";
+
+	print &ui_form_start("login.cgi", "post");
+	print &ui_table_start($text{'index_ltitle'}, undef, 2);
+
+	print &ui_table_row($text{'index_login'},
+		&ui_textbox("login", $access{'user'} || $config{'login'}, 40));
+
+	print &ui_table_row($text{'index_pass'},
+		&ui_password("pass", undef, 40));
+
+	print &ui_table_end();
+	print &ui_form_end([ [ undef, $text{'save'} ] ]);
+
 	print &text('index_emsg', "<tt>$rout</tt>"),"<p>\n";
 	}
 else {
diff --git a/mysql/mysql-lib.pl b/mysql/mysql-lib.pl
index 9f951da04..85f22abb8 100644
--- a/mysql/mysql-lib.pl
+++ b/mysql/mysql-lib.pl
@@ -203,6 +203,19 @@ foreach $r (@{$s->{'data'}}) {
 return @rv;
 }
 
+# table_field_sizes(db, table)
+# Returns a hash mapping field names to sizes
+sub table_field_sizes
+{
+local %rv;
+foreach my $s (&table_structure(@_)) {
+	if ($s->{'type'} =~ /^\S+\((\d+)(,\d+)?\)/) {
+		$rv{lc($s->{'field'})} = $1;
+		}
+	}
+return %rv;
+}
+
 # execute_sql(database, command, [param, ...])
 # Executes some SQL and returns the results, after checking for the user's
 # readonly status.