diff --git a/ui/sign-in/src/SignInPage.tsx b/ui/sign-in/src/SignInPage.tsx
index a1339c3..8e08e7f 100644
--- a/ui/sign-in/src/SignInPage.tsx
+++ b/ui/sign-in/src/SignInPage.tsx
@@ -54,7 +54,9 @@ function pickRandom(arr: string[]) {
 
 function getInitialMode(): Mode {
   const params = new URLSearchParams(window.location.search);
-  return params.get('first_screen') === 'register' ? 'register' : 'signIn';
+  if (params.get('first_screen') === 'register') return 'register';
+  if (window.location.pathname.endsWith('/register')) return 'register';
+  return 'signIn';
 }
 
 export function SignInPage() {