diff --git a/main/interfaces/Default/templates/config_server.tmpl b/main/interfaces/Default/templates/config_server.tmpl
index c6570ea..45d6826 100644
--- a/main/interfaces/Default/templates/config_server.tmpl
+++ b/main/interfaces/Default/templates/config_server.tmpl
@@ -26,7 +26,9 @@
       <p><input type="submit" value="Add Server"></p>
     </fieldset>
   </form>
-<!--#for $server in $servers#-->
+<!--#set $slist = $servers.keys()#-->
+<!--#$slist.sort()#-->
+<!--#for $server in $slist#-->
   <form action="saveServer" method="post">
     <fieldset class="EntryFieldSet">
       <legend>$server</legend>
diff --git a/main/interfaces/Plush/templates/config_server.tmpl b/main/interfaces/Plush/templates/config_server.tmpl
index 21634a5..bb8718e 100644
--- a/main/interfaces/Plush/templates/config_server.tmpl
+++ b/main/interfaces/Plush/templates/config_server.tmpl
@@ -38,7 +38,9 @@
 			</fieldset>
 			</form>
 			
-			<!--#for $server in $servers#-->
+            <!--#set $slist = $servers.keys()#-->
+            <!--#$slist.sort()#-->
+            <!--#for $server in $slist#-->
 			<form action="saveServer" method="post">
 			<fieldset class="EntryFieldSet">
 				
diff --git a/main/interfaces/iphone/templates/config_server.tmpl b/main/interfaces/iphone/templates/config_server.tmpl
index 1f8ab8c..c86ff36 100644
--- a/main/interfaces/iphone/templates/config_server.tmpl
+++ b/main/interfaces/iphone/templates/config_server.tmpl
@@ -7,7 +7,9 @@
     </ul>
 
 
- <!--#for $server in $servers#-->
+ <!--#set $slist = $servers.keys()#-->
+ <!--#$slist.sort()#-->
+ <!--#for $server in $slist#-->
   <form title="$servers[$server]['host']$servers[$server]['port']" class="panel" action="javascript:var dummy=0" id="$servers[$server]['host']$servers[$server]['port']">
 <fieldset class="EntryFieldSet">
       <h2>$server</h2>
diff --git a/main/interfaces/prototype/templates/config_server.tmpl b/main/interfaces/prototype/templates/config_server.tmpl
index 4b2a6a2..1cc9689 100644
--- a/main/interfaces/prototype/templates/config_server.tmpl
+++ b/main/interfaces/prototype/templates/config_server.tmpl
@@ -2,7 +2,9 @@
 <a href="$helpuri/Configure+Servers" id="help">Help</a><h3>Server configuration</h3>
 <div class="EntryBlock">
 <br class="clear"/>
- <!--#for $server in $servers#-->
+ <!--#set $slist = $servers.keys()#-->
+ <!--#$slist.sort()#-->
+ <!--#for $server in $slist#-->
  <div class="server">
   <form class="cmxform" id="$servers[$server]['host']$servers[$server]['port']">
     <fieldset class="EntryFieldSet">
diff --git a/main/interfaces/smpl/templates/config_server.tmpl b/main/interfaces/smpl/templates/config_server.tmpl
index bbfeef7..a5b042b 100644
--- a/main/interfaces/smpl/templates/config_server.tmpl
+++ b/main/interfaces/smpl/templates/config_server.tmpl
@@ -2,8 +2,10 @@
 <a href="$helpuri/Configure+Servers" id="help">Help</a><h3>Server configuration</h3>
 <div class="EntryBlock">
 <br class="clear"/>
- <!--#for $server in $servers#-->
- <div class="server">
+ <!--#set $slist = $servers.keys()#-->
+ <!--#$slist.sort()#-->
+ <!--#for $server in $slist#-->
+<div class="server">
   <form class="cmxform" id="$servers[$server]['host']$servers[$server]['port']">
     <fieldset class="EntryFieldSet">
       <legend>$server</legend>