diff --git a/cadvisor.go b/cadvisor.go
index 7321f9cd..d5d3fe3c 100644
--- a/cadvisor.go
+++ b/cadvisor.go
@@ -93,6 +93,7 @@ func main() {
 	http.Handle("/", http.RedirectHandler(pages.ContainersPage, http.StatusTemporaryRedirect))
 
 	var authenticated bool = false
+
 	// Setup the authenticator object
         if *httpAuthFile!="" {
                 secrets := auth.HtpasswdFileProvider(*httpAuthFile)
diff --git a/pages/pages.go b/pages/pages.go
index 462710aa..c71b96e0 100644
--- a/pages/pages.go
+++ b/pages/pages.go
@@ -81,42 +81,28 @@ func dockerHandler(containerManager manager.Manager) auth.AuthenticatedHandlerFu
 	}
 }
 
-// Register http handlers for pages.
+// Register http handlers
 func RegisterHandlersDigest(containerManager manager.Manager,authenticator *auth.DigestAuth) error {
-
 	// Register the handler for the containers page.
 	if authenticator!=nil {
 		http.HandleFunc(ContainersPage, authenticator.Wrap(containerHandler(containerManager)))
+                http.HandleFunc(DockerPage, authenticator.Wrap(dockerHandler(containerManager)))
 	} else {
 		http.HandleFunc(ContainersPage, containerHandlerNoAuth(containerManager))
+                http.HandleFunc(DockerPage, dockerHandlerNoAuth(containerManager))
 	}
-
-	// Register the handler for the docker page.
-	if authenticator!=nil {
-		http.HandleFunc(DockerPage, authenticator.Wrap(dockerHandler(containerManager)))
-	} else {
-		http.HandleFunc(ContainersPage, dockerHandlerNoAuth(containerManager))
-	}
-
 	return nil
 }
 
 func RegisterHandlersBasic(containerManager manager.Manager,authenticator *auth.BasicAuth) error {
-
-        // Register the handler for the containers page.
+        // Register the handler for the containers and docker age.
         if authenticator!=nil {
                 http.HandleFunc(ContainersPage, authenticator.Wrap(containerHandler(containerManager)))
-        } else {
-                http.HandleFunc(ContainersPage, containerHandlerNoAuth(containerManager))
-        }
-
-        // Register the handler for the docker page.
-        if authenticator!=nil {
                 http.HandleFunc(DockerPage, authenticator.Wrap(dockerHandler(containerManager)))
         } else {
+                http.HandleFunc(ContainersPage, containerHandlerNoAuth(containerManager))
                 http.HandleFunc(DockerPage, dockerHandlerNoAuth(containerManager))
         }
-
         return nil
 }