diff --git a/atst/handlers/workspace.py b/atst/handlers/workspace.py
index 5a1f80ec..a14458a6 100644
--- a/atst/handlers/workspace.py
+++ b/atst/handlers/workspace.py
@@ -12,4 +12,4 @@ class Workspace(BaseHandler):
     @tornado.gen.coroutine
     def get(self, workspace_id):
         projects = self.projects_repo.get_many(workspace_id)
-        self.render("workspace.html.to", projects=projects)
+        self.render("workspace_projects.html.to", workspace_id=workspace_id, projects=projects)
diff --git a/atst/handlers/workspace_members.py b/atst/handlers/workspace_members.py
index c9b12fdf..9ffa7958 100644
--- a/atst/handlers/workspace_members.py
+++ b/atst/handlers/workspace_members.py
@@ -12,4 +12,4 @@ class WorkspaceMembers(BaseHandler):
     @tornado.gen.coroutine
     def get(self, workspace_id):
         members = self.members_repo.get_many(workspace_id)
-        self.render("workspace_members.html.to", members=members)
+        self.render("workspace_members.html.to", workspace_id=workspace_id, members=members)