diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/Admin.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/Admin.pm
index d4e822816af..e6141cf9e0b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/Admin.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/Admin.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Admin::sortkey = "01";
+our $sortkey = 200;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/Attachment.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/Attachment.pm
index 3468f084c20..ed4c4e45962 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/Attachment.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/Attachment.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Attachment::sortkey = "025";
+our $sortkey = 400;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/Auth.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/Auth.pm
index 1af808eaaa8..c7d921ed57b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/Auth.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/Auth.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Auth::sortkey = "02";
+our $sortkey = 300;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm
index 0e518b68993..4e197c5e932 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Bugzilla::Status;
 
-$Bugzilla::Config::BugChange::sortkey = "03";
+our $sortkey = 500;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm
index c7f7f6e5ace..9f3ddc9abb1 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/BugFields.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Bugzilla::Field;
 
-$Bugzilla::Config::BugFields::sortkey = "04";
+our $sortkey = 600;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/BugMove.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/BugMove.pm
index 87f6cbd7325..2d973d8cab1 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/BugMove.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/BugMove.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::BugMove::sortkey = "05";
+our $sortkey = 700;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/Core.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/Core.pm
index 1bfebfa69a9..550875e35ae 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/Core.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/Core.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Core::sortkey = "00";
+our $sortkey = 100;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/DependencyGraph.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/DependencyGraph.pm
index db784c13564..b217bfb0656 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/DependencyGraph.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/DependencyGraph.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::DependencyGraph::sortkey = "06";
+our $sortkey = 800;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/GroupSecurity.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/GroupSecurity.pm
index f0038f153fc..f7f717379d5 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/GroupSecurity.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/GroupSecurity.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Bugzilla::Group;
 
-$Bugzilla::Config::GroupSecurity::sortkey = "07";
+our $sortkey = 900;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/LDAP.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/LDAP.pm
index a9b46382e3f..e47f923083f 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/LDAP.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/LDAP.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::LDAP::sortkey = "09";
+our $sortkey = 1000;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
index c7843e286df..b1e3ab1a48a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Email::Send;
 
-$Bugzilla::Config::MTA::sortkey = "10";
+our $sortkey = 1200;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/PatchViewer.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/PatchViewer.pm
index 8de04ef76e0..6bd9557a995 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/PatchViewer.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/PatchViewer.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::PatchViewer::sortkey = "11";
+our $sortkey = 1300;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/Query.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/Query.pm
index 6479db8ceac..808a9a102c0 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/Query.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/Query.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Query::sortkey = "12";
+our $sortkey = 1400;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/RADIUS.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/RADIUS.pm
index 6701d6f0893..bc072a9c4d5 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/RADIUS.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/RADIUS.pm
@@ -25,7 +25,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::RADIUS::sortkey = "09";
+our $sortkey = 1100;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/ShadowDB.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/ShadowDB.pm
index f9af4fb6dd8..a605b236351 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/ShadowDB.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/ShadowDB.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::ShadowDB::sortkey = "13";
+our $sortkey = 1500;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/UserMatch.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/UserMatch.pm
index 9e19f1d2bc4..f97cfeab2af 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/UserMatch.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/UserMatch.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::UserMatch::sortkey = "14";
+our $sortkey = 1600;
 
 sub get_param_list {
   my $class = shift;
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl
index a35ec0f4ae7..666d88dffe7 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/params/editparams.html.tmpl
@@ -27,7 +27,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% curpanel = -1 %]
-[% panels = panels.sort('sortkey') %]
+[% panels = panels.nsort('sortkey') %]
 
 [% FOREACH panel = panels %]
   [% PROCESS "admin/params/${panel.name}.html.tmpl"