diff --git a/NEWS.mdtext b/NEWS.mdtext
index 6add8ed..703336e 100644
--- a/NEWS.mdtext
+++ b/NEWS.mdtext
@@ -17,6 +17,9 @@
 - Fix SSH public key parsing issues and improve the check for existing, uploaded keys (issue 679)
 - Diff views now show empty context lines for git and hg again (issue 688)
 - Let the SVN command line client not store the login credentials we give him as arguments
+- The usher section in the forge administration no longer displays a bogus
+  server enty in case no monotone server is configured in the connected
+  usher instance
 
 ## Documentation
 
diff --git a/src/IDF/Scm/Monotone/Usher.php b/src/IDF/Scm/Monotone/Usher.php
index 614a94f..bbe4704 100644
--- a/src/IDF/Scm/Monotone/Usher.php
+++ b/src/IDF/Scm/Monotone/Usher.php
@@ -48,7 +48,7 @@ class IDF_Scm_Monotone_Usher
         if ($conn == 'none')
             return array();
 
-        return preg_split('/[ ]/', $conn);
+        return preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);
     }
 
     /**
@@ -73,7 +73,7 @@ class IDF_Scm_Monotone_Usher
         if ($conn == 'none')
             return array();
 
-        $single_conns = preg_split('/[ ]/', $conn);
+        $single_conns = preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);
         $ret = array();
         foreach ($single_conns as $conn) {
             preg_match('/\((\w+)\)([^:]+):(\d+)/', $conn, $matches);
diff --git a/src/IDF/templates/idf/gadmin/usher/connections.html b/src/IDF/templates/idf/gadmin/usher/connections.html
index bde9e2f..8af6f60 100644
--- a/src/IDF/templates/idf/gadmin/usher/connections.html
+++ b/src/IDF/templates/idf/gadmin/usher/connections.html
@@ -8,12 +8,18 @@
     <th>{trans "address"}</th>
     <th>{trans "port"}</th>
 </tr>
+{if count($connections) == 0}
+<tr>
+    <td colspan="2" align="center">{trans 'No connections found.'}</td>
+</tr>
+{else}
 {foreach $connections as $connection}
 <tr>
     <td>{$connection.address}</td>
     <td>{$connection.port}</td>
 </tr>
 {/foreach}
+{/if}
 </table>
 {/block}
 
diff --git a/src/IDF/templates/idf/gadmin/usher/index.html b/src/IDF/templates/idf/gadmin/usher/index.html
index fa6041b..9232765 100644
--- a/src/IDF/templates/idf/gadmin/usher/index.html
+++ b/src/IDF/templates/idf/gadmin/usher/index.html
@@ -9,6 +9,11 @@
     <th>{trans "status"}</th>
     <th>{trans "action"}</th>
 </tr>
+{if count($servers) == 0}
+<tr>
+    <td colspan="3" align="center">{trans 'No monotone servers configured.'}</td>
+</tr>
+{else}
 {foreach $servers as $server}
 <tr>
     <td>{$server.name}</td>
@@ -31,6 +36,7 @@
         {/if}
 </tr>
 {/foreach}
+{/if}
 </table>
 {/block}