diff --git a/LICENSE b/LICENSE
index 977c8cbd2..ec56a714f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 Stack is licensed per-package, and 100% open-source.
 
-Client libraries and examples are licensed under an open-source MIT license. Server components are licensed under an open-source AGPLv3 license. Please refer to each package's `LICENSE` files for more information.
+Generally speaking, client code and examples are licensed under an open-source MIT license, while server components are licensed under an open-source AGPLv3 license. Please refer to each package's `LICENSE` files for more information.
 
 We also have enterprise licenses available, if you prefer; please contact [enterprise@stack-auth.com](mailto:enterprise@stack-auth.com).
diff --git a/packages/template/src/components/selected-team-switcher.tsx b/packages/template/src/components/selected-team-switcher.tsx
index 62a354d50..6562371d2 100644
--- a/packages/template/src/components/selected-team-switcher.tsx
+++ b/packages/template/src/components/selected-team-switcher.tsx
@@ -54,7 +54,7 @@ function Fallback() {
 function Inner(props: SelectedTeamSwitcherProps) {
   const { t } = useTranslation();
   const appFromHook = useStackApp();
-  const userFromHook = useUser({ or: props.mockUser ? 'return-null' : undefined });
+  const userFromHook = useUser();
 
   // Use mock data if provided, otherwise use real data
   const app = props.mockUser ? {
diff --git a/packages/template/src/components/user-button.tsx b/packages/template/src/components/user-button.tsx
index ec2208311..8c48ddc5a 100644
--- a/packages/template/src/components/user-button.tsx
+++ b/packages/template/src/components/user-button.tsx
@@ -43,7 +43,7 @@ export function UserButton(props: UserButtonProps) {
 }
 
 function UserButtonInner(props: UserButtonProps) {
-  const userFromHook = useUser({ or: props.mockUser ? 'return-null' : 'redirect' });
+  const userFromHook = useUser();
 
   // Use mock user if provided, otherwise use real user
   const user = props.mockUser ? {