diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml
index e0b7ed579..0d5e76bde 100644
--- a/guacamole/src/main/webapp/WEB-INF/web.xml
+++ b/guacamole/src/main/webapp/WEB-INF/web.xml
@@ -37,14 +37,21 @@
         <listener-class>org.glyptodon.guacamole.net.basic.WebSocketSupportLoader</listener-class>
     </listener>
 
-    <!-- Authenticate against all requests -->
+    <!-- Authenticate against service calls and pages -->
     <filter>
         <filter-name>AuthenticatingFilter</filter-name>
         <filter-class>org.glyptodon.guacamole.net.basic.AuthenticatingFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>AuthenticatingFilter</filter-name>
-        <url-pattern>/*</url-pattern>
+        <url-pattern>*.xhtml</url-pattern>
+        <url-pattern>/login</url-pattern>
+        <url-pattern>/clipboard</url-pattern>
+        <url-pattern>/connections/*</url-pattern>
+        <url-pattern>/connectiongroups/*</url-pattern>
+        <url-pattern>/users/*</url-pattern>
+        <url-pattern>/permissions/*</url-pattern>
+        <url-pattern>/protocols/*</url-pattern>
     </filter-mapping>
 
     <!-- Restrict requests to the WebSocket tunnel -->