diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 685045312..b6b61ad74 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -29,7 +29,7 @@
         <div class="client-body" guac-touch-drag="clientDrag" guac-touch-pinch="clientPinch">
 
             <!-- Client -->
-            <guac-client client="client"/></guac-client>
+            <guac-client client="client"></guac-client>
 
         </div>
 
diff --git a/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html b/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html
index 07cf4b52b..27e514daf 100644
--- a/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html
+++ b/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html
@@ -30,7 +30,7 @@
 
             <!-- Connection thumbnail -->
             <div class="thumbnail">
-                <guac-thumbnail client="activeConnection.client"/></guac-thumbnail>
+                <guac-thumbnail client="activeConnection.client"></guac-thumbnail>
             </div>
 
             <!-- Connection name -->
diff --git a/guacamole/src/main/webapp/app/home/templates/home.html b/guacamole/src/main/webapp/app/home/templates/home.html
index 887b93cad..5fabad7c5 100644
--- a/guacamole/src/main/webapp/app/home/templates/home.html
+++ b/guacamole/src/main/webapp/app/home/templates/home.html
@@ -32,7 +32,7 @@
         <!-- The recent connections for this user -->
         <h2>{{'HOME.SECTION_HEADER_RECENT_CONNECTIONS' | translate}}</h2>
         <div class="recent-connections">
-            <guac-recent-connections root-group="rootConnectionGroup"/>
+            <guac-recent-connections root-group="rootConnectionGroup"></guac-recent-connections>
         </div>
 
         <!-- All connections for this user -->
@@ -41,7 +41,7 @@
             <guac-group-list
                 connection-group="rootConnectionGroup"
                 connection-template="'app/home/templates/connection.html'"
-                connection-group-template="'app/home/templates/connectionGroup.html'"/>
+                connection-group-template="'app/home/templates/connectionGroup.html'"></guac-group-list>
         </div>
 
     </div>
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
index 85dca606a..b4e5be351 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
@@ -68,7 +68,7 @@ THE SOFTWARE.
             <tr ng-repeat="parameter in protocols[connection.protocol].parameters">
                 <th>{{getProtocolParameterName(connection.protocol, parameter.name) | translate}}</th>
                 <td>
-                    <guac-connection-parameter protocol="protocols[connection.protocol]" name="parameter.name" parameters="parameters"/>
+                    <guac-connection-parameter protocol="protocols[connection.protocol]" name="parameter.name" parameters="parameters"></guac-connection-parameter>
                 </td>
             </tr>
         </table>
diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index 0f6971afb..ffa6eb08b 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -37,7 +37,7 @@ THE SOFTWARE.
         <!-- Global status/error dialog -->
         <div ng-class="{shown: status}" class="status-outer">
             <div class="status-middle">
-                <guac-notification notification="status"/>
+                <guac-notification notification="status"></guac-notification>
             </div>
         </div>
         
@@ -47,7 +47,7 @@ THE SOFTWARE.
         <!-- Notification area -->
         <div id="notificationArea">
             <div ng-repeat="wrapper in notifications">
-                <guac-notification notification="wrapper.notification"/>
+                <guac-notification notification="wrapper.notification"></guac-notification>
             </div>                
         </div>