diff --git a/webui/src/components/BugTitleForm/BugTitleForm.tsx b/webui/src/components/BugTitleForm/BugTitleForm.tsx
index 16441c93c3fb0ce5ee2179d3a527f791df452d5f..c47eab312edd361fe2081bad0fd13c2c3269a240 100644
--- a/webui/src/components/BugTitleForm/BugTitleForm.tsx
+++ b/webui/src/components/BugTitleForm/BugTitleForm.tsx
@@ -9,6 +9,7 @@ import {
 } from '@material-ui/core';
 
 import { TimelineDocument } from '../../pages/bug/TimelineQuery.generated';
+import IfLoggedIn from '../IfLoggedIn/IfLoggedIn';
 import Author from 'src/components/Author';
 import Date from 'src/components/Date';
 import { BugFragment } from 'src/pages/bug/Bug.generated';
@@ -156,23 +157,27 @@ function BugTitleForm({ bug }: Props) {
           <span className={classes.readOnlyTitle}>{bug.title}</span>
           <span className={classes.readOnlyId}>{bug.humanId}</span>
         </div>
-        <div className={classes.editButtonContainer}>
-          <Button
-            size="small"
-            variant="contained"
-            onClick={() => setbugTitleEdition(!bugTitleEdition)}
-          >
-            Edit
-          </Button>
-          <Button
-            className={classes.greenButton}
-            size="small"
-            variant="contained"
-            href="/new"
-          >
-            New issue
-          </Button>
-        </div>
+        <IfLoggedIn>
+          {() => (
+            <div className={classes.editButtonContainer}>
+              <Button
+                size="small"
+                variant="contained"
+                onClick={() => setbugTitleEdition(!bugTitleEdition)}
+              >
+                Edit
+              </Button>
+              <Button
+                className={classes.greenButton}
+                size="small"
+                variant="contained"
+                href="/new"
+              >
+                New issue
+              </Button>
+            </div>
+          )}
+        </IfLoggedIn>
       </div>
     );
   }
diff --git a/webui/src/pages/list/ListQuery.tsx b/webui/src/pages/list/ListQuery.tsx
index 424ffac0d8b490455dfd8337771bd38bf192401c..87c21e3c2d3ce25d129ed84314a2dc17d3f13441 100644
--- a/webui/src/pages/list/ListQuery.tsx
+++ b/webui/src/pages/list/ListQuery.tsx
@@ -12,6 +12,8 @@ import KeyboardArrowLeft from '@material-ui/icons/KeyboardArrowLeft';
 import KeyboardArrowRight from '@material-ui/icons/KeyboardArrowRight';
 import Skeleton from '@material-ui/lab/Skeleton';
 
+import IfLoggedIn from 'src/components/IfLoggedIn/IfLoggedIn';
+
 import FilterToolbar from './FilterToolbar';
 import List from './List';
 import { useListBugsQuery } from './ListQuery.generated';
@@ -310,9 +312,17 @@ function ListQuery() {
             </button>
           </form>
         </div>
-        <Button className={classes.greenButton} variant="contained" href="/new">
-          New issue
-        </Button>
+        <IfLoggedIn>
+          {() => (
+            <Button
+              className={classes.greenButton}
+              variant="contained"
+              href="/new"
+            >
+              New issue
+            </Button>
+          )}
+        </IfLoggedIn>
       </header>
       <FilterToolbar query={query} queryLocation={queryLocation} />
       {content}