diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm
index 6c942568f40..17b79941d34 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm
@@ -84,30 +84,34 @@ sub get_param_list {
 
   {
    name => 'defaultpriority',
-   type => 't',
-   default => 'P2',
+   type => 's',
+   choices => \@::legal_priority,
+   default => $::legal_priority[-1],
    checker => \&check_priority
   },
 
   {
    name => 'defaultseverity',
-   type => 't',
-   default => 'normal',
+   type => 's',
+   choices => \@::legal_severity,
+   default => $::legal_severity[-1],
    checker => \&check_severity
   },
 
   {
-    name => 'defaultplatform',
-    type => 't',
-    default => '',
-    checker => \&check_platform
+   name => 'defaultplatform',
+   type => 's',
+   choices => ['', @::legal_platform],
+   default => '',
+   checker => \&check_platform
   },
 
   {
-    name => 'defaultopsys',
-    type => 't',
-    default => '',
-    checker => \&check_opsys
+   name => 'defaultopsys',
+   type => 's',
+   choices => ['', @::legal_opsys],
+   default => '',
+   checker => \&check_opsys
   } );
   return @param_list;
 }
diff --git a/mozilla/webtools/bugzilla/editparams.cgi b/mozilla/webtools/bugzilla/editparams.cgi
index 54d3a3a0a38..1aa52d81a4e 100755
--- a/mozilla/webtools/bugzilla/editparams.cgi
+++ b/mozilla/webtools/bugzilla/editparams.cgi
@@ -48,6 +48,8 @@ my $current_panel = $cgi->param('section') || 'core';
 $current_panel =~ /^([A-Za-z0-9_-]+)$/;
 $current_panel = $1;
 
+GetVersionTable();
+
 my $current_module;
 my @panels = ();
 foreach my $panel (@parampanels) {