diff --git a/frontend/src/pages/log-in.ts b/frontend/src/pages/log-in.ts
index 68e21d03..f4f1efd7 100644
--- a/frontend/src/pages/log-in.ts
+++ b/frontend/src/pages/log-in.ts
@@ -372,7 +372,7 @@ export class LogInPage extends LiteElement {
     } catch (e: any) {
       if (e.isApiError) {
         let message = msg("Sorry, invalid username or password");
-        if (e.message == "Too Many Requests") {
+        if (e.statusCode === 429) {
           message = msg(
             "Sorry, too many failed login attempts. A reset password link has been sent to your email."
           );
diff --git a/frontend/src/pages/org/crawl-detail.ts b/frontend/src/pages/org/crawl-detail.ts
index 2af1fa71..83835cac 100644
--- a/frontend/src/pages/org/crawl-detail.ts
+++ b/frontend/src/pages/org/crawl-detail.ts
@@ -468,9 +468,7 @@ export class CrawlDetail extends LiteElement {
               <sl-menu-item
                 @click=${() =>
                   this.navTo(
-                    `/orgs/${this.crawl!.oid}/workflows/crawl/${
-                      this.crawl!.cid
-                    }`
+                    `${this.orgBasePath}/workflows/crawl/${this.crawl!.cid}`
                   )}
               >
                 <sl-icon name="arrow-return-right" slot="prefix"></sl-icon>
diff --git a/frontend/src/pages/org/crawls-list.ts b/frontend/src/pages/org/crawls-list.ts
index 33c47e68..7dd6e7eb 100644
--- a/frontend/src/pages/org/crawls-list.ts
+++ b/frontend/src/pages/org/crawls-list.ts
@@ -456,7 +456,7 @@ export class CrawlsList extends LiteElement {
               <sl-menu-item
                 @click=${() =>
                   this.navTo(
-                    `/orgs/${item.oid}/crawls/${
+                    `${this.orgBasePath}/items/${
                       item.type === "upload" ? "upload" : "crawl"
                     }/${item.id}`
                   )}
@@ -493,7 +493,7 @@ export class CrawlsList extends LiteElement {
         () => html`
           <sl-menu-item
             @click=${() =>
-              this.navTo(`/orgs/${item.oid}/workflows/crawl/${item.cid}`)}
+              this.navTo(`${this.orgBasePath}/workflows/crawl/${item.cid}`)}
           >
             <sl-icon name="arrow-return-right" slot="prefix"></sl-icon>
             ${msg("Go to Workflow")}