diff --git a/assets/pages/tracking/WatchlistPage.tsx b/assets/pages/tracking/WatchlistPage.tsx
index 79c716b..02aac57 100644
--- a/assets/pages/tracking/WatchlistPage.tsx
+++ b/assets/pages/tracking/WatchlistPage.tsx
@@ -1,6 +1,6 @@
 import React, {useEffect, useState} from "react";
 import {Card, Divider, Flex, Form, message} from "antd";
-import {EventAction, getWatchlists, putWatchlist, postWatchlist} from "../../utils/api";
+import {EventAction, getWatchlists, postWatchlist, putWatchlist} from "../../utils/api";
 import {AxiosError} from "axios";
 import {t} from 'ttag'
 import {WatchlistForm} from "../../components/tracking/watchlist/WatchlistForm";
@@ -35,7 +35,7 @@ export default function WatchlistPage() {
         emailTriggers: string[]
         connector?: string
     }) => {
-        const domainsURI = values.domains.map(d => '/api/domains/' + d)
+        const domainsURI = values.domains.map(d => '/api/domains/' + d.toLowerCase())
         postWatchlist({
             name: values.name,
             domains: domainsURI,
@@ -57,7 +57,7 @@ export default function WatchlistPage() {
         emailTriggers: string[]
         connector?: string
     }) => {
-        const domainsURI = values.domains.map(d => '/api/domains/' + d)
+        const domainsURI = values.domains.map(d => '/api/domains/' + d.toLowerCase())
 
         return putWatchlist({
             token: values.token,
diff --git a/src/Security/JWTAuthenticator.php b/src/Security/JWTAuthenticator.php
index bcd0fb0..2972003 100644
--- a/src/Security/JWTAuthenticator.php
+++ b/src/Security/JWTAuthenticator.php
@@ -43,7 +43,7 @@ class JWTAuthenticator implements AuthenticationSuccessHandlerInterface
             new Cookie(
                 'BEARER',
                 $jwt,
-                time() + 7200, // expiration
+                time() + 604800, // expiration
                 '/',
                 null,
                 true,
diff --git a/src/Security/OAuthAuthenticator.php b/src/Security/OAuthAuthenticator.php
index 2d3f24c..59c6067 100644
--- a/src/Security/OAuthAuthenticator.php
+++ b/src/Security/OAuthAuthenticator.php
@@ -75,7 +75,7 @@ class OAuthAuthenticator extends OAuth2Authenticator implements AuthenticationEn
             new Cookie(
                 'BEARER',
                 $token,
-                time() + 7200, // expiration
+                time() + 604800, // expiration
                 '/',
                 null,
                 true,