diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.js
index 520c339f..e3a7e2c2 100644
--- a/components/WebsiteDetails.js
+++ b/components/WebsiteDetails.js
@@ -30,16 +30,19 @@ const views = {
   event: EventsTable,
 };
 
-export default function WebsiteDetails({ websiteId, shareId }) {
+export default function WebsiteDetails({ websiteId, token }) {
   const router = useRouter();
-  const { data } = useFetch(`/api/website/${websiteId}`, { share_id: shareId });
+  const { data } = useFetch(`/api/website/${websiteId}`, { token });
   const [chartLoaded, setChartLoaded] = useState(false);
   const [countryData, setCountryData] = useState();
   const [eventsData, setEventsData] = useState();
   const {
     query: { id, view },
+    basePath,
+    asPath,
   } = router;
-  const path = `/website/${id.join('/')}`;
+
+  const path = `${basePath}/${asPath.split('/')[1]}/${id.join('/')}`;
 
   const BackButton = () => (
     <Button
@@ -91,6 +94,7 @@ export default function WebsiteDetails({ websiteId, shareId }) {
 
   const tableProps = {
     websiteId,
+    token,
     websiteDomain: data?.domain,
     limit: 10,
     onExpand: handleExpand,
@@ -118,6 +122,7 @@ export default function WebsiteDetails({ websiteId, shareId }) {
         <div className={classNames(styles.chart, 'col')}>
           <WebsiteChart
             websiteId={websiteId}
+            token={token}
             title={data.name}
             onDataLoad={handleDataLoad}
             showLink={false}
@@ -162,13 +167,18 @@ export default function WebsiteDetails({ websiteId, shareId }) {
               <EventsTable {...tableProps} onDataLoad={setEventsData} />
             </div>
             <div className="col-12 col-md-12 col-lg-8 pt-5 pb-5">
-              <EventsChart websiteId={websiteId} />
+              <EventsChart websiteId={websiteId} token={token} />
             </div>
           </div>
         </>
       )}
       {view && (
-        <MenuLayout className={styles.view} menuClassName={styles.menu} menu={menuOptions}>
+        <MenuLayout
+          className={styles.view}
+          menuClassName={styles.menu}
+          contentClassName={styles.content}
+          menu={menuOptions}
+        >
           <DetailsComponent {...tableProps} limit={false} />
         </MenuLayout>
       )}
diff --git a/components/WebsiteDetails.module.css b/components/WebsiteDetails.module.css
index cbde6159..4f117ba1 100644
--- a/components/WebsiteDetails.module.css
+++ b/components/WebsiteDetails.module.css
@@ -10,6 +10,10 @@
   font-size: var(--font-size-small);
 }
 
+.content {
+  min-height: 600px;
+}
+
 .backButton {
   align-self: flex-start;
   margin-bottom: 16px;
diff --git a/components/common/RefreshButton.js b/components/common/RefreshButton.js
index b3e00a27..1fa02f48 100644
--- a/components/common/RefreshButton.js
+++ b/components/common/RefreshButton.js
@@ -5,7 +5,7 @@ import { setDateRange } from 'redux/actions/websites';
 import Button from './Button';
 import Refresh from 'assets/redo.svg';
 import Dots from 'assets/ellipsis-h.svg';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 import { getDateRange } from '../../lib/date';
 
 export default function RefreshButton({ websiteId }) {
diff --git a/components/metrics/ActiveUsers.js b/components/metrics/ActiveUsers.js
index 3335bd74..3d7b7001 100644
--- a/components/metrics/ActiveUsers.js
+++ b/components/metrics/ActiveUsers.js
@@ -4,8 +4,8 @@ import useFetch from 'hooks/useFetch';
 import styles from './ActiveUsers.module.css';
 import { FormattedMessage } from 'react-intl';
 
-export default function ActiveUsers({ websiteId, className }) {
-  const { data } = useFetch(`/api/website/${websiteId}/active`, {}, { interval: 60000 });
+export default function ActiveUsers({ websiteId, token, className }) {
+  const { data } = useFetch(`/api/website/${websiteId}/active`, { token }, { interval: 60000 });
   const count = useMemo(() => {
     return data?.[0]?.x || 0;
   }, [data]);
diff --git a/components/metrics/BrowsersTable.js b/components/metrics/BrowsersTable.js
index 36cfe82f..f092e62f 100644
--- a/components/metrics/BrowsersTable.js
+++ b/components/metrics/BrowsersTable.js
@@ -3,13 +3,14 @@ import { FormattedMessage } from 'react-intl';
 import MetricsTable from './MetricsTable';
 import { browserFilter } from 'lib/filters';
 
-export default function BrowsersTable({ websiteId, limit, onExpand }) {
+export default function BrowsersTable({ websiteId, token, limit, onExpand }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.browsers" defaultMessage="Browsers" />}
       type="browser"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={browserFilter}
       onExpand={onExpand}
diff --git a/components/metrics/CountriesTable.js b/components/metrics/CountriesTable.js
index e7857b6d..1f516653 100644
--- a/components/metrics/CountriesTable.js
+++ b/components/metrics/CountriesTable.js
@@ -3,13 +3,20 @@ import MetricsTable from './MetricsTable';
 import { countryFilter, percentFilter } from 'lib/filters';
 import { FormattedMessage } from 'react-intl';
 
-export default function CountriesTable({ websiteId, limit, onDataLoad = () => {}, onExpand }) {
+export default function CountriesTable({
+  websiteId,
+  token,
+  limit,
+  onDataLoad = () => {},
+  onExpand,
+}) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.countries" defaultMessage="Countries" />}
       type="country"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={countryFilter}
       onDataLoad={data => onDataLoad(percentFilter(data))}
diff --git a/components/metrics/DevicesTable.js b/components/metrics/DevicesTable.js
index c37d18ea..85d2bdfd 100644
--- a/components/metrics/DevicesTable.js
+++ b/components/metrics/DevicesTable.js
@@ -4,13 +4,14 @@ import { deviceFilter } from 'lib/filters';
 import { FormattedMessage } from 'react-intl';
 import { getDeviceMessage } from 'components/messages';
 
-export default function DevicesTable({ websiteId, limit, onExpand }) {
+export default function DevicesTable({ websiteId, token, limit, onExpand }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.devices" defaultMessage="Devices" />}
       type="device"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={deviceFilter}
       renderLabel={({ x }) => getDeviceMessage(x)}
diff --git a/components/metrics/EventsChart.js b/components/metrics/EventsChart.js
index 1d8bb557..4a49d129 100644
--- a/components/metrics/EventsChart.js
+++ b/components/metrics/EventsChart.js
@@ -3,7 +3,7 @@ import tinycolor from 'tinycolor2';
 import BarChart from './BarChart';
 import { getTimezone, getDateArray, getDateLength } from 'lib/date';
 import useFetch from 'hooks/useFetch';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 
 const COLORS = [
   '#2680eb',
@@ -16,7 +16,7 @@ const COLORS = [
   '#85d044',
 ];
 
-export default function EventsChart({ websiteId }) {
+export default function EventsChart({ websiteId, token }) {
   const dateRange = useDateRange(websiteId);
   const { startDate, endDate, unit, modified } = dateRange;
   const { data } = useFetch(
@@ -26,6 +26,7 @@ export default function EventsChart({ websiteId }) {
       end_at: +endDate,
       unit,
       tz: getTimezone(),
+      token,
     },
     { update: [modified] },
   );
diff --git a/components/metrics/EventsTable.js b/components/metrics/EventsTable.js
index ccc13411..948b9f7a 100644
--- a/components/metrics/EventsTable.js
+++ b/components/metrics/EventsTable.js
@@ -3,13 +3,14 @@ import { FormattedMessage } from 'react-intl';
 import MetricsTable from './MetricsTable';
 import styles from './EventsTable.module.css';
 
-export default function EventsTable({ websiteId, limit, onExpand, onDataLoad }) {
+export default function EventsTable({ websiteId, token, limit, onExpand, onDataLoad }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.events" defaultMessage="Events" />}
       type="event"
       metric={<FormattedMessage id="metrics.actions" defaultMessage="Actions" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       renderLabel={({ x }) => <Label value={x} />}
       onExpand={onExpand}
diff --git a/components/metrics/MetricsBar.js b/components/metrics/MetricsBar.js
index 8e3fe009..8d128c18 100644
--- a/components/metrics/MetricsBar.js
+++ b/components/metrics/MetricsBar.js
@@ -3,12 +3,12 @@ import { FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import Loading from 'components/common/Loading';
 import useFetch from 'hooks/useFetch';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 import { formatShortTime, formatNumber, formatLongNumber } from 'lib/format';
 import MetricCard from './MetricCard';
 import styles from './MetricsBar.module.css';
 
-export default function MetricsBar({ websiteId, className }) {
+export default function MetricsBar({ websiteId, token, className }) {
   const dateRange = useDateRange(websiteId);
   const { startDate, endDate, modified } = dateRange;
   const { data } = useFetch(
@@ -16,6 +16,7 @@ export default function MetricsBar({ websiteId, className }) {
     {
       start_at: +startDate,
       end_at: +endDate,
+      token,
     },
     {
       update: [modified],
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 05756614..560c25f0 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -10,12 +10,13 @@ import useFetch from 'hooks/useFetch';
 import Arrow from 'assets/arrow-right.svg';
 import { percentFilter } from 'lib/filters';
 import { formatNumber, formatLongNumber } from 'lib/format';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 import styles from './MetricsTable.module.css';
 
 export default function MetricsTable({
   websiteId,
   websiteDomain,
+  token,
   title,
   metric,
   type,
@@ -37,6 +38,7 @@ export default function MetricsTable({
       start_at: +startDate,
       end_at: +endDate,
       domain: websiteDomain,
+      token,
     },
     { onDataLoad, delay: 300, update: [modified] },
   );
diff --git a/components/metrics/OSTable.js b/components/metrics/OSTable.js
index 499e0f33..14f943a1 100644
--- a/components/metrics/OSTable.js
+++ b/components/metrics/OSTable.js
@@ -3,13 +3,14 @@ import MetricsTable from './MetricsTable';
 import { osFilter } from 'lib/filters';
 import { FormattedMessage } from 'react-intl';
 
-export default function OSTable({ websiteId, limit, onExpand }) {
+export default function OSTable({ websiteId, token, limit, onExpand }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />}
       type="os"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={osFilter}
       onExpand={onExpand}
diff --git a/components/metrics/PagesTable.js b/components/metrics/PagesTable.js
index 71466728..5730cf90 100644
--- a/components/metrics/PagesTable.js
+++ b/components/metrics/PagesTable.js
@@ -5,7 +5,7 @@ import { urlFilter } from 'lib/filters';
 import { FILTER_COMBINED, FILTER_RAW } from 'lib/constants';
 import MetricsTable from './MetricsTable';
 
-export default function PagesTable({ websiteId, websiteDomain, limit, onExpand }) {
+export default function PagesTable({ websiteId, token, websiteDomain, limit, onExpand }) {
   const [filter, setFilter] = useState(FILTER_COMBINED);
 
   const buttons = [
@@ -25,6 +25,7 @@ export default function PagesTable({ websiteId, websiteDomain, limit, onExpand }
         limit ? null : <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />
       }
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={urlFilter}
       filterOptions={{ domain: websiteDomain, raw: filter === FILTER_RAW }}
diff --git a/components/metrics/QuickButtons.js b/components/metrics/QuickButtons.js
deleted file mode 100644
index 57e7a251..00000000
--- a/components/metrics/QuickButtons.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import ButtonGroup from 'components/common/ButtonGroup';
-import { getDateRange } from 'lib/date';
-import styles from './QuickButtons.module.css';
-
-const options = [
-  { label: '24h', value: '24hour' },
-  { label: '7d', value: '7day' },
-  { label: '30d', value: '30day' },
-];
-
-export default function QuickButtons({ value, onChange }) {
-  const selectedItem = options.find(item => item.value === value)?.value;
-
-  function handleClick(selected) {
-    if (selected !== value) {
-      onChange(getDateRange(selected));
-    }
-  }
-
-  return (
-    <ButtonGroup
-      size="xsmall"
-      className={styles.buttons}
-      items={options}
-      selectedItem={selectedItem}
-      onClick={handleClick}
-    />
-  );
-}
diff --git a/components/metrics/QuickButtons.module.css b/components/metrics/QuickButtons.module.css
deleted file mode 100644
index c5c6e3c7..00000000
--- a/components/metrics/QuickButtons.module.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.buttons {
-  display: flex;
-  align-content: center;
-  position: absolute;
-  top: 0;
-  right: 0;
-  margin: auto;
-}
-
-.buttons button + button {
-  margin-left: 10px;
-}
-
-.buttons .button {
-  font-size: var(--font-size-xsmall);
-  padding: 4px 8px;
-}
-
-.active {
-  font-weight: 600;
-}
-
-@media only screen and (max-width: 768px) {
-  .buttons button:last-child {
-    display: none;
-  }
-}
-
-@media only screen and (max-width: 576px) {
-  .buttons {
-    display: none;
-  }
-}
diff --git a/components/metrics/ReferrersTable.js b/components/metrics/ReferrersTable.js
index 0527c68a..39136a71 100644
--- a/components/metrics/ReferrersTable.js
+++ b/components/metrics/ReferrersTable.js
@@ -5,7 +5,13 @@ import { refFilter } from 'lib/filters';
 import ButtonGroup from 'components/common/ButtonGroup';
 import { FILTER_DOMAIN_ONLY, FILTER_COMBINED, FILTER_RAW } from 'lib/constants';
 
-export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpand = () => {} }) {
+export default function ReferrersTable({
+  websiteId,
+  websiteDomain,
+  token,
+  limit,
+  onExpand = () => {},
+}) {
   const [filter, setFilter] = useState(FILTER_COMBINED);
 
   const buttons = [
@@ -40,6 +46,7 @@ export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpa
       }
       websiteId={websiteId}
       websiteDomain={websiteDomain}
+      token={token}
       limit={limit}
       dataFilter={refFilter}
       filterOptions={{
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index 8cf01a5a..f2485888 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -3,17 +3,18 @@ import { useDispatch } from 'react-redux';
 import classNames from 'classnames';
 import PageviewsChart from './PageviewsChart';
 import MetricsBar from './MetricsBar';
+import WebsiteHeader from './WebsiteHeader';
 import DateFilter from 'components/common/DateFilter';
 import StickyHeader from 'components/helpers/StickyHeader';
 import useFetch from 'hooks/useFetch';
+import useDateRange from 'hooks/useDateRange';
 import { getDateArray, getDateLength, getTimezone } from 'lib/date';
 import { setDateRange } from 'redux/actions/websites';
 import styles from './WebsiteChart.module.css';
-import WebsiteHeader from './WebsiteHeader';
-import { useDateRange } from '../../hooks/useDateRange';
 
 export default function WebsiteChart({
   websiteId,
+  token,
   title,
   stickyHeader = false,
   showLink = false,
@@ -30,6 +31,7 @@ export default function WebsiteChart({
       end_at: +endDate,
       unit,
       tz: getTimezone(),
+      token,
     },
     { onDataLoad, update: [modified] },
   );
@@ -50,7 +52,7 @@ export default function WebsiteChart({
 
   return (
     <>
-      <WebsiteHeader websiteId={websiteId} title={title} showLink={showLink} />
+      <WebsiteHeader websiteId={websiteId} token={token} title={title} showLink={showLink} />
       <div className={classNames(styles.header, 'row')}>
         <StickyHeader
           className={classNames(styles.metrics, 'col row')}
@@ -58,7 +60,7 @@ export default function WebsiteChart({
           enabled={stickyHeader}
         >
           <div className="col-12 col-lg-9">
-            <MetricsBar websiteId={websiteId} />
+            <MetricsBar websiteId={websiteId} token={token} />
           </div>
           <div className={classNames(styles.filter, 'col-12 col-lg-3')}>
             <DateFilter
diff --git a/components/metrics/WebsiteHeader.js b/components/metrics/WebsiteHeader.js
index 7f34ca2b..d8f53421 100644
--- a/components/metrics/WebsiteHeader.js
+++ b/components/metrics/WebsiteHeader.js
@@ -2,18 +2,18 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import Link from 'components/common/Link';
 import PageHeader from 'components/layout/PageHeader';
+import RefreshButton from 'components/common/RefreshButton';
+import ButtonLayout from 'components/layout/ButtonLayout';
+import Icon from 'components/common/Icon';
 import ActiveUsers from './ActiveUsers';
 import Arrow from 'assets/arrow-right.svg';
 import styles from './WebsiteHeader.module.css';
-import RefreshButton from '../common/RefreshButton';
-import ButtonLayout from '../layout/ButtonLayout';
-import Icon from '../common/Icon';
 
-export default function WebsiteHeader({ websiteId, title, showLink = false }) {
+export default function WebsiteHeader({ websiteId, token, title, showLink = false }) {
   return (
     <PageHeader>
       <div className={styles.title}>{title}</div>
-      <ActiveUsers className={styles.active} websiteId={websiteId} />
+      <ActiveUsers className={styles.active} websiteId={websiteId} token={token} />
       <ButtonLayout>
         <RefreshButton websiteId={websiteId} />
         {showLink && (
diff --git a/components/settings/ProfileSettings.js b/components/settings/ProfileSettings.js
index 4e82f192..69bc34e9 100644
--- a/components/settings/ProfileSettings.js
+++ b/components/settings/ProfileSettings.js
@@ -10,7 +10,7 @@ import DateFilter from 'components/common/DateFilter';
 import Dots from 'assets/ellipsis-h.svg';
 import { getTimezone } from 'lib/date';
 import { setItem } from 'lib/web';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 import { setDateRange } from 'redux/actions/websites';
 import styles from './ProfileSettings.module.css';
 
diff --git a/hooks/useDateRange.js b/hooks/useDateRange.js
index 9718c0e2..e6ad6808 100644
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@@ -3,7 +3,7 @@ import { parseISO } from 'date-fns';
 import { getDateRange } from 'lib/date';
 import { getItem } from 'lib/web';
 
-export function useDateRange(websiteId, defaultDateRange = '7day') {
+export default function useDateRange(websiteId, defaultDateRange = '24hour') {
   const globalDefault = getItem('umami.date-range');
 
   if (globalDefault) {
diff --git a/lib/auth.js b/lib/auth.js
index b9344448..370db1c4 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -1,9 +1,49 @@
 import { parse } from 'cookie';
-import { parseSecureToken } from './crypto';
+import { parseSecureToken, parseToken } from './crypto';
 import { AUTH_COOKIE_NAME } from './constants';
+import { getWebsiteById } from './queries';
 
-export async function verifyAuthToken(req) {
+export async function getAuthToken(req) {
   const token = parse(req.headers.cookie || '')[AUTH_COOKIE_NAME];
 
   return parseSecureToken(token);
 }
+
+export async function isValidToken(token, validation) {
+  try {
+    const result = await parseToken(token);
+
+    if (typeof validation === 'object') {
+      return !Object.keys(validation).find(key => result[key] !== validation[key]);
+    } else if (typeof validation === 'function') {
+      return validation(result);
+    }
+  } catch (e) {
+    return false;
+  }
+
+  return false;
+}
+
+export async function allowQuery(req, skipToken) {
+  const { id, token } = req.query;
+  const websiteId = +id;
+
+  const website = await getWebsiteById(websiteId);
+
+  if (website) {
+    if (token && !skipToken) {
+      return isValidToken(token, { website_id: websiteId });
+    }
+
+    const authToken = await getAuthToken(req);
+
+    if (authToken) {
+      const { user_id, is_admin } = authToken;
+
+      return is_admin || website.user_id === user_id;
+    }
+  }
+
+  return false;
+}
diff --git a/lib/crypto.js b/lib/crypto.js
index 8a96e785..37279daf 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -27,7 +27,7 @@ export function uuid(...args) {
   return v5(args.join(''), salt());
 }
 
-export function isValidId(s) {
+export function isValidUuid(s) {
   return validate(s);
 }
 
diff --git a/lib/middleware.js b/lib/middleware.js
index 5cbe9c2c..014b225d 100644
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -1,6 +1,6 @@
 import cors from 'cors';
-import { verifySession } from './session';
-import { verifyAuthToken } from './auth';
+import { getSession } from './session';
+import { getAuthToken } from './auth';
 import { unauthorized, badRequest, serverError } from './response';
 
 export function use(middleware) {
@@ -21,7 +21,7 @@ export const useSession = use(async (req, res, next) => {
   let session;
 
   try {
-    session = await verifySession(req);
+    session = await getSession(req);
   } catch (e) {
     return serverError(res, e.message);
   }
@@ -35,13 +35,7 @@ export const useSession = use(async (req, res, next) => {
 });
 
 export const useAuth = use(async (req, res, next) => {
-  let token;
-
-  try {
-    token = await verifyAuthToken(req);
-  } catch (e) {
-    return serverError(res, e.message);
-  }
+  const token = await getAuthToken(req);
 
   if (!token) {
     return unauthorized(res);
diff --git a/lib/session.js b/lib/session.js
index ef9f403f..0488b730 100644
--- a/lib/session.js
+++ b/lib/session.js
@@ -1,8 +1,8 @@
 import { getWebsiteByUuid, getSessionByUuid, createSession } from 'lib/queries';
 import { getClientInfo } from 'lib/request';
-import { uuid, isValidId } from 'lib/crypto';
+import { uuid, isValidUuid } from 'lib/crypto';
 
-export async function verifySession(req) {
+export async function getSession(req) {
   const { payload } = req.body;
 
   if (!payload) {
@@ -11,7 +11,7 @@ export async function verifySession(req) {
 
   const { website: website_uuid, hostname, screen, language } = payload;
 
-  if (!isValidId(website_uuid)) {
+  if (!isValidUuid(website_uuid)) {
     throw new Error(`Invalid website: ${website_uuid}`);
   }
 
diff --git a/pages/api/share/[id].js b/pages/api/share/[id].js
index edce6cfd..461e008e 100644
--- a/pages/api/share/[id].js
+++ b/pages/api/share/[id].js
@@ -1,5 +1,6 @@
 import { getWebsiteByShareId } from 'lib/queries';
 import { ok, notFound, methodNotAllowed } from 'lib/response';
+import { createToken } from 'lib/crypto';
 
 export default async (req, res) => {
   const { id } = req.query;
@@ -8,7 +9,10 @@ export default async (req, res) => {
     const website = await getWebsiteByShareId(id);
 
     if (website) {
-      return ok(res, website);
+      const websiteId = website.website_id;
+      const token = await createToken({ website_id: websiteId });
+
+      return ok(res, { websiteId, token });
     }
 
     return notFound(res);
diff --git a/pages/api/website/[id]/active.js b/pages/api/website/[id]/active.js
index 8c331c44..280bc06e 100644
--- a/pages/api/website/[id]/active.js
+++ b/pages/api/website/[id]/active.js
@@ -1,12 +1,18 @@
 import { getActiveVisitors } from 'lib/queries';
-import { methodNotAllowed, ok } from 'lib/response';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 export default async (req, res) => {
   if (req.method === 'GET') {
-    const { id } = req.query;
-    const website_id = +id;
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
 
-    const result = await getActiveVisitors(website_id);
+    const { id } = req.query;
+
+    const websiteId = +id;
+
+    const result = await getActiveVisitors(websiteId);
 
     return ok(res, result);
   }
diff --git a/pages/api/website/[id]/events.js b/pages/api/website/[id]/events.js
index 9e3b6b51..4b9a656d 100644
--- a/pages/api/website/[id]/events.js
+++ b/pages/api/website/[id]/events.js
@@ -1,11 +1,16 @@
 import moment from 'moment-timezone';
 import { getEvents } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 const unitTypes = ['year', 'month', 'hour', 'day'];
 
 export default async (req, res) => {
   if (req.method === 'GET') {
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
     const { id, start_at, end_at, unit, tz } = req.query;
 
     if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
diff --git a/pages/api/website/[id]/index.js b/pages/api/website/[id]/index.js
index efbcb2d5..74ce0f33 100644
--- a/pages/api/website/[id]/index.js
+++ b/pages/api/website/[id]/index.js
@@ -1,30 +1,30 @@
 import { deleteWebsite, getWebsiteById } from 'lib/queries';
-import { useAuth } from 'lib/middleware';
 import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 export default async (req, res) => {
-  await useAuth(req, res);
+  const { id } = req.query;
 
-  const { user_id, is_admin } = req.auth;
-  const { id, share_id } = req.query;
   const websiteId = +id;
 
-  const website = await getWebsiteById(websiteId);
-
   if (req.method === 'GET') {
-    if (is_admin || website.user_id === user_id || (share_id && website.share_id === share_id)) {
-      return ok(res, website);
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
     }
-    return unauthorized(res);
+
+    const website = await getWebsiteById(websiteId);
+
+    return ok(res, website);
   }
 
   if (req.method === 'DELETE') {
-    if (is_admin || website.user_id === user_id) {
-      await deleteWebsite(websiteId);
-
-      return ok(res);
+    if (!(await allowQuery(req, true))) {
+      return unauthorized(res);
     }
-    return unauthorized(res);
+
+    await deleteWebsite(websiteId);
+
+    return ok(res);
   }
 
   return methodNotAllowed(res);
diff --git a/pages/api/website/[id]/metrics.js b/pages/api/website/[id]/metrics.js
index 07496b25..bb5c977b 100644
--- a/pages/api/website/[id]/metrics.js
+++ b/pages/api/website/[id]/metrics.js
@@ -1,9 +1,15 @@
 import { getMetrics } from 'lib/queries';
-import { methodNotAllowed, ok } from 'lib/response';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 export default async (req, res) => {
   if (req.method === 'GET') {
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
     const { id, start_at, end_at } = req.query;
+
     const websiteId = +id;
     const startDate = new Date(+start_at);
     const endDate = new Date(+end_at);
diff --git a/pages/api/website/[id]/pageviews.js b/pages/api/website/[id]/pageviews.js
index db5b6c33..016c6646 100644
--- a/pages/api/website/[id]/pageviews.js
+++ b/pages/api/website/[id]/pageviews.js
@@ -1,21 +1,26 @@
 import moment from 'moment-timezone';
 import { getPageviews } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 const unitTypes = ['year', 'month', 'hour', 'day'];
 
 export default async (req, res) => {
   if (req.method === 'GET') {
-    const { id, start_at, end_at, unit, tz } = req.query;
-
-    if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
-      return badRequest(res);
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
     }
 
+    const { id, start_at, end_at, unit, tz } = req.query;
+
     const websiteId = +id;
     const startDate = new Date(+start_at);
     const endDate = new Date(+end_at);
 
+    if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
+      return badRequest(res);
+    }
+
     const [pageviews, uniques] = await Promise.all([
       getPageviews(websiteId, startDate, endDate, tz, unit, '*'),
       getPageviews(websiteId, startDate, endDate, tz, unit, 'distinct session_id'),
diff --git a/pages/api/website/[id]/rankings.js b/pages/api/website/[id]/rankings.js
index 838aefa3..90a0cd9f 100644
--- a/pages/api/website/[id]/rankings.js
+++ b/pages/api/website/[id]/rankings.js
@@ -1,6 +1,7 @@
 import { getRankings } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
 import { DOMAIN_REGEX } from 'lib/constants';
+import { allowQuery } from 'lib/auth';
 
 const sessionColumns = ['browser', 'os', 'device', 'country'];
 const pageviewColumns = ['url', 'referrer'];
@@ -26,7 +27,12 @@ function getColumn(type) {
 
 export default async (req, res) => {
   if (req.method === 'GET') {
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
     const { id, type, start_at, end_at, domain } = req.query;
+
     const websiteId = +id;
     const startDate = new Date(+start_at);
     const endDate = new Date(+end_at);
diff --git a/pages/api/website/index.js b/pages/api/website/index.js
index 35e5d410..dab9a94d 100644
--- a/pages/api/website/index.js
+++ b/pages/api/website/index.js
@@ -15,21 +15,21 @@ export default async (req, res) => {
     if (website_id) {
       const website = await getWebsiteById(website_id);
 
-      if (website.user_id === user_id || is_admin) {
-        let { share_id } = website;
-
-        if (enable_share_url) {
-          share_id = share_id ? share_id : getRandomChars(8);
-        } else {
-          share_id = null;
-        }
-
-        await updateWebsite(website_id, { name, domain, share_id });
-
-        return ok(res);
+      if (website.user_id !== user_id && !is_admin) {
+        return unauthorized(res);
       }
 
-      return unauthorized(res);
+      let { share_id } = website;
+
+      if (enable_share_url) {
+        share_id = share_id ? share_id : getRandomChars(8);
+      } else {
+        share_id = null;
+      }
+
+      await updateWebsite(website_id, { name, domain, share_id });
+
+      return ok(res);
     } else {
       const website_uuid = uuid();
       const share_id = enable_share_url ? getRandomChars(8) : null;
diff --git a/pages/api/websites.js b/pages/api/websites.js
index 894226be..42b6182c 100644
--- a/pages/api/websites.js
+++ b/pages/api/websites.js
@@ -7,13 +7,14 @@ export default async (req, res) => {
 
   const { user_id: current_user_id, is_admin } = req.auth;
   const { user_id } = req.query;
+  const userId = +user_id;
 
   if (req.method === 'GET') {
-    if (user_id && !is_admin) {
+    if (userId !== current_user_id && !is_admin) {
       return unauthorized(res);
     }
 
-    const websites = await getUserWebsites(+user_id || current_user_id);
+    const websites = await getUserWebsites(userId || current_user_id);
 
     return ok(res, websites);
   }
diff --git a/pages/share/[...id].js b/pages/share/[...id].js
index 81e57c92..c4fa9a63 100644
--- a/pages/share/[...id].js
+++ b/pages/share/[...id].js
@@ -14,9 +14,11 @@ export default function SharePage() {
     return null;
   }
 
+  const { websiteId, token } = data;
+
   return (
     <Layout>
-      <WebsiteDetails websiteId={data.website_id} shareId={shareId} />
+      <WebsiteDetails websiteId={websiteId} token={token} />
     </Layout>
   );
 }