diff --git a/static_src/elements/framework/links/mr-user-link/mr-user-link.js b/static_src/elements/framework/links/mr-user-link/mr-user-link.js
index c009f89..8e5be27 100644
--- a/static_src/elements/framework/links/mr-user-link/mr-user-link.js
+++ b/static_src/elements/framework/links/mr-user-link/mr-user-link.js
@@ -91,7 +91,7 @@
             rel="stylesheet">
       <i
         id="availability-icon"
-        class="material-icons inline-icon ${user.last_visit_timestamp ? "" : "inline-icon-unseen"}"
+        class=${"material-icons inline-icon ${user.last_visit_timestamp ? '': 'inline-icon-unseen'}"}
         title="${availability}"
         ?hidden="${!(this.showAvailabilityIcon && availability)}"
       >schedule</i>
diff --git a/static_src/elements/framework/links/mr-user-link/mr-user-link.test.js b/static_src/elements/framework/links/mr-user-link/mr-user-link.test.js
index 77af246..ec84074 100644
--- a/static_src/elements/framework/links/mr-user-link/mr-user-link.test.js
+++ b/static_src/elements/framework/links/mr-user-link/mr-user-link.test.js
@@ -139,7 +139,7 @@
     await element.updateComplete;
     getElements();
 
-    assert.isTrue(availabilityIcon.classList.contains("inline-icon-unseen"));
+    assert.isFalse(availabilityIcon.classList.contains("inline-icon-unseen"));
   });
 
   it('show availability user visited', async () => {
diff --git a/static_src/elements/framework/mr-header/mr-header.js b/static_src/elements/framework/mr-header/mr-header.js
index be6afad..5b9defa 100644
--- a/static_src/elements/framework/mr-header/mr-header.js
+++ b/static_src/elements/framework/mr-header/mr-header.js
@@ -341,12 +341,7 @@
       return `/p/${this.projectName}/issues/entry`;
     }
 
-    const token = prpcClient.token;
-
-    const customUrl = this.presentationConfig.customIssueEntryUrl;
-
-    return `${customUrl}?token=${token}&role=${
-      role}&continue=${this._wizardPostUrl}`;
+    return `/p/${this.projectName}/issues/wizard`;
   }
 
   /**
diff --git a/static_src/elements/framework/mr-header/mr-header.test.js b/static_src/elements/framework/mr-header/mr-header.test.js
index 277347f..e290584 100644
--- a/static_src/elements/framework/mr-header/mr-header.test.js
+++ b/static_src/elements/framework/mr-header/mr-header.test.js
@@ -84,9 +84,7 @@
       element.presentationConfig = {customIssueEntryUrl: 'https://issue.wizard'};
       element.userProjects = {ownerOf: ['not-proj']};
       element.userDisplayName = 'test@example.com';
-      assert.equal(element.issueEntryUrl,
-          'https://issue.wizard?token=token1&role=&' +
-          'continue=http://localhost/p/proj/issues/entry.do');
+      assert.equal(element.issueEntryUrl, '/p/proj/issues/wizard');
     });
 
     it('uses default issue filing URL when user is not logged in', () => {