diff --git a/packages/app-content-pages/package.json b/packages/app-content-pages/package.json
index 5a197b6736..c0c9e8d87a 100644
--- a/packages/app-content-pages/package.json
+++ b/packages/app-content-pages/package.json
@@ -48,7 +48,6 @@
     "snazzy": "^8.0.0",
     "styled-components": "~5.3.3",
     "superagent": "~8.0.0",
-    "url-parse": "~1.5.1",
     "validator": "~13.7.0"
   },
   "devDependencies": {
diff --git a/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.js b/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.js
index 93572c8575..77a9c582e7 100644
--- a/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.js
+++ b/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.js
@@ -2,18 +2,17 @@ import { inject, observer } from 'mobx-react'
 import { withRouter } from 'next/router'
 import { func, shape, string } from 'prop-types'
 import { Component } from 'react'
-import Url from 'url-parse'
 
 import AuthModal from './AuthModal'
 
 class AuthModalContainer extends Component {
-  constructor () {
+  constructor() {
     super()
     this.closeModal = this.closeModal.bind(this)
     this.onActive = this.onActive.bind(this)
   }
 
-  onActive (activeIndex) {
+  onActive(activeIndex) {
     const url = this.getUrlObject()
 
     if (activeIndex === 0) {
@@ -27,53 +26,49 @@ class AuthModalContainer extends Component {
     this.redirect(url)
   }
 
-  closeModal () {
+  closeModal() {
     const url = this.getUrlObject()
     this.removeUrlQuery(url, 'login')
     this.removeUrlQuery(url, 'register')
     return this.redirect(url)
   }
 
-  getActiveIndexFromUrl () {
-    const { query } = this.getUrlObject()
-    const params = {
-      login: query.login === 'true',
-      register: query.register === 'true'
-    }
+  getActiveIndexFromUrl() {
+    const url = this.getUrlObject()
 
     let activeIndex = -1
 
-    if (params.login) {
+    if (url.searchParams?.has('login')) {
       activeIndex = 0
-    } else if (params.register) {
+    } else if (url.searchParams?.has('register')) {
       activeIndex = 1
     }
 
     return activeIndex
   }
 
-  getUrlObject () {
-    const { asPath } = this.props.router
-    return new Url(asPath, true)
+  getUrlObject() {
+    const isBrowser = typeof window !== 'undefined'
+    if (isBrowser) {
+      return new URL(window.location)
+    }
+    return ''
   }
 
-  redirect (urlObject) {
-    const { pathname, push } = this.props.router
-    const urlString = urlObject.toString().substr(urlObject.origin.length)
-    push(pathname, urlString, { shallow: true })
+  redirect(urlObject) {
+    const { push } = this.props.router
+    push(urlObject, urlObject, { shallow: true })
   }
 
-  addUrlQuery (urlObject, paramToAdd) {
-    urlObject.set('query', { [paramToAdd]: true, ...urlObject.query })
+  addUrlQuery(urlObject, paramToAdd) {
+    urlObject.searchParams.set(paramToAdd, true)
   }
 
-  removeUrlQuery (urlObject, paramToRemove) {
-    const query = { ...urlObject.query }
-    delete query[paramToRemove]
-    urlObject.set('query', query)
+  removeUrlQuery(urlObject, paramToRemove) {
+    urlObject.searchParams.delete(paramToRemove)
   }
 
-  render () {
+  render() {
     const activeIndex = this.getActiveIndexFromUrl()
     return (
       <AuthModal
diff --git a/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.spec.js b/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.spec.js
index cb84e92be5..c3a36d6e96 100644
--- a/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.spec.js
+++ b/packages/app-content-pages/src/shared/components/AuthModal/AuthModalContainer.spec.js
@@ -29,17 +29,25 @@ describe('Component > AuthModalContainer', function () {
   })
 
   it('should pass a prop to show the Login tab if there is a matching url query', function () {
+    global.dom.reconfigure({
+      url: 'https://localhost/foo/bar?login=true'
+    })
     const loginWrapper = shallow(<AuthModalContainer router={ROUTER} />)
-    expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(-1)
-    loginWrapper.setProps({ router: { ...ROUTER, asPath: '/?login=true' } })
     expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(0)
+    global.dom.reconfigure({
+      url: 'https://localhost'
+    })
   })
 
   it('should pass a prop to show the Register tab if there is a matching url query', function () {
+    global.dom.reconfigure({
+      url: 'https://localhost/foo/bar?register=true'
+    })
     const loginWrapper = shallow(<AuthModalContainer router={ROUTER} />)
-    expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(-1)
-    loginWrapper.setProps({ router: { ...ROUTER, asPath: '/?register=true' } })
     expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(1)
+    global.dom.reconfigure({
+      url: 'https://localhost'
+    })
   })
 })
 
diff --git a/packages/app-content-pages/src/shared/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js b/packages/app-content-pages/src/shared/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js
index b011feace6..a678e24e9a 100644
--- a/packages/app-content-pages/src/shared/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js
+++ b/packages/app-content-pages/src/shared/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js
@@ -4,9 +4,8 @@ import { withRouter } from 'next/router'
 import auth from 'panoptes-client/lib/auth'
 import { bool, func, shape, string } from 'prop-types'
 import { Component } from 'react'
-import Url from 'url-parse'
 
-function storeMapper (stores) {
+function storeMapper(stores) {
   const { user } = stores.store
   return {
     user
@@ -14,62 +13,84 @@ function storeMapper (stores) {
 }
 
 class ZooHeaderWrapperContainer extends Component {
-  constructor () {
+  constructor() {
     super()
     this.openRegisterModal = this.openRegisterModal.bind(this)
     this.openSignInModal = this.openSignInModal.bind(this)
     this.signOut = this.signOut.bind(this)
   }
 
-  createUserProp () {
+  createUserProp() {
     const { user } = this.props
     return (user.isLoggedIn)
-      ? { 'display_name': user['display_name'] }
+      ? { display_name: user.display_name, login: user.login }
       : {}
   }
 
-  getUrlObject () {
-    const { asPath } = this.props.router
-    return new Url(asPath, true)
+  getUrlObject() {
+    return new URL(window.location)
   }
 
-  addUrlQuery (urlObject, propertyToAdd) {
-    const query = Object.assign({}, urlObject.query, {
-      [propertyToAdd]: 'true'
-    })
-    urlObject.set('query', query)
+  addUrlQuery(urlObject, propertyToAdd) {
+    urlObject.searchParams.set(propertyToAdd, true)
   }
 
-  redirect (urlObject) {
-    const { pathname, push } = this.props.router
-    const urlString = urlObject.toString().substr(urlObject.origin.length)
-    push(pathname, urlString, { shallow: true })
+  redirect(urlObject) {
+    const { push } = this.props.router
+    push(urlObject, urlObject, { shallow: true })
   }
 
-  openRegisterModal () {
+  openRegisterModal() {
     const url = this.getUrlObject()
     this.addUrlQuery(url, 'register')
     return this.redirect(url)
   }
 
-  openSignInModal () {
+  openSignInModal() {
     const url = this.getUrlObject()
     this.addUrlQuery(url, 'login')
     return this.redirect(url)
   }
 
-  signOut () {
-    auth.signOut()
-      .then(() => this.props.user.clear())
+  signOut() {
+    return auth.signOut()
+      .then(() => {
+        this.props.user.clear()
+        // resetting the alreay seen subjects during the session tracking should move
+        // once we refactor the UPP and User resource tracking in the classifier
+        // Current implementation in classifier is possibly buggy (see discussion https://github.com/zooniverse/front-end-monorepo/discussions/2362)
+        // likely a user id prop will be passed to the classifier and that will be reacted to with an effect hook
+        /// which would reset the subject already seen tracking
+        // I needed to guarantee that this happened on sign out only so that's why this is here for now
+        const seenThisSession = (window) ? window.sessionStorage.getItem("subjectsSeenThisSession") : null
+
+        if (seenThisSession) {
+          window.sessionStorage.removeItem("subjectsSeenThisSession")
+        }
+      })
+  }
+
+  unreadMessages() {
+    const { user } = this.props
+
+    return user?.personalization?.notifications?.unreadConversationsIds.length
   }
 
-  render () {
+  unreadNotifications() {
+    const { user } = this.props
+    
+    return user?.personalization?.notifications?.unreadNotificationsCount
+  }
+
+  render() {
     return (
       <ZooHeader
         {...this.props}
         register={this.openRegisterModal}
         signIn={this.openSignInModal}
         signOut={this.signOut}
+        unreadMessages={this.unreadMessages()}
+        unreadNotifications={this.unreadNotifications()}
         user={this.createUserProp()}
       />
     )
@@ -85,10 +106,12 @@ ZooHeaderWrapperContainer.propTypes = {
   user: shape({
     clear: func,
     display_name: string,
+    login: string,
     isLoggedIn: bool
   })
 }
 
+
 @withRouter
 @inject(storeMapper)
 @observer
diff --git a/packages/app-content-pages/test/create-global-document.js b/packages/app-content-pages/test/create-global-document.js
index 94e2711511..f0ca3d6c0e 100644
--- a/packages/app-content-pages/test/create-global-document.js
+++ b/packages/app-content-pages/test/create-global-document.js
@@ -15,6 +15,7 @@ function copyProps (src, target) {
   Object.defineProperties(target, props)
 }
 
+global.dom = jsdom
 global.window = window
 global.document = window.document
 global.navigator = {
diff --git a/packages/app-project/package.json b/packages/app-project/package.json
index bf0a733189..7f1ea8f3e7 100644
--- a/packages/app-project/package.json
+++ b/packages/app-project/package.json
@@ -63,7 +63,6 @@
     "styled-components": "~5.3.3",
     "svg-loaders-react": "~2.2.1",
     "swr": "~1.3.0",
-    "url-parse": "~1.5.1",
     "validator": "~13.7.0"
   },
   "devDependencies": {
diff --git a/packages/app-project/src/components/AuthModal/AuthModalContainer.js b/packages/app-project/src/components/AuthModal/AuthModalContainer.js
index 93572c8575..77a9c582e7 100644
--- a/packages/app-project/src/components/AuthModal/AuthModalContainer.js
+++ b/packages/app-project/src/components/AuthModal/AuthModalContainer.js
@@ -2,18 +2,17 @@ import { inject, observer } from 'mobx-react'
 import { withRouter } from 'next/router'
 import { func, shape, string } from 'prop-types'
 import { Component } from 'react'
-import Url from 'url-parse'
 
 import AuthModal from './AuthModal'
 
 class AuthModalContainer extends Component {
-  constructor () {
+  constructor() {
     super()
     this.closeModal = this.closeModal.bind(this)
     this.onActive = this.onActive.bind(this)
   }
 
-  onActive (activeIndex) {
+  onActive(activeIndex) {
     const url = this.getUrlObject()
 
     if (activeIndex === 0) {
@@ -27,53 +26,49 @@ class AuthModalContainer extends Component {
     this.redirect(url)
   }
 
-  closeModal () {
+  closeModal() {
     const url = this.getUrlObject()
     this.removeUrlQuery(url, 'login')
     this.removeUrlQuery(url, 'register')
     return this.redirect(url)
   }
 
-  getActiveIndexFromUrl () {
-    const { query } = this.getUrlObject()
-    const params = {
-      login: query.login === 'true',
-      register: query.register === 'true'
-    }
+  getActiveIndexFromUrl() {
+    const url = this.getUrlObject()
 
     let activeIndex = -1
 
-    if (params.login) {
+    if (url.searchParams?.has('login')) {
       activeIndex = 0
-    } else if (params.register) {
+    } else if (url.searchParams?.has('register')) {
       activeIndex = 1
     }
 
     return activeIndex
   }
 
-  getUrlObject () {
-    const { asPath } = this.props.router
-    return new Url(asPath, true)
+  getUrlObject() {
+    const isBrowser = typeof window !== 'undefined'
+    if (isBrowser) {
+      return new URL(window.location)
+    }
+    return ''
   }
 
-  redirect (urlObject) {
-    const { pathname, push } = this.props.router
-    const urlString = urlObject.toString().substr(urlObject.origin.length)
-    push(pathname, urlString, { shallow: true })
+  redirect(urlObject) {
+    const { push } = this.props.router
+    push(urlObject, urlObject, { shallow: true })
   }
 
-  addUrlQuery (urlObject, paramToAdd) {
-    urlObject.set('query', { [paramToAdd]: true, ...urlObject.query })
+  addUrlQuery(urlObject, paramToAdd) {
+    urlObject.searchParams.set(paramToAdd, true)
   }
 
-  removeUrlQuery (urlObject, paramToRemove) {
-    const query = { ...urlObject.query }
-    delete query[paramToRemove]
-    urlObject.set('query', query)
+  removeUrlQuery(urlObject, paramToRemove) {
+    urlObject.searchParams.delete(paramToRemove)
   }
 
-  render () {
+  render() {
     const activeIndex = this.getActiveIndexFromUrl()
     return (
       <AuthModal
diff --git a/packages/app-project/src/components/AuthModal/AuthModalContainer.spec.js b/packages/app-project/src/components/AuthModal/AuthModalContainer.spec.js
index cb84e92be5..c3a36d6e96 100644
--- a/packages/app-project/src/components/AuthModal/AuthModalContainer.spec.js
+++ b/packages/app-project/src/components/AuthModal/AuthModalContainer.spec.js
@@ -29,17 +29,25 @@ describe('Component > AuthModalContainer', function () {
   })
 
   it('should pass a prop to show the Login tab if there is a matching url query', function () {
+    global.dom.reconfigure({
+      url: 'https://localhost/foo/bar?login=true'
+    })
     const loginWrapper = shallow(<AuthModalContainer router={ROUTER} />)
-    expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(-1)
-    loginWrapper.setProps({ router: { ...ROUTER, asPath: '/?login=true' } })
     expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(0)
+    global.dom.reconfigure({
+      url: 'https://localhost'
+    })
   })
 
   it('should pass a prop to show the Register tab if there is a matching url query', function () {
+    global.dom.reconfigure({
+      url: 'https://localhost/foo/bar?register=true'
+    })
     const loginWrapper = shallow(<AuthModalContainer router={ROUTER} />)
-    expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(-1)
-    loginWrapper.setProps({ router: { ...ROUTER, asPath: '/?register=true' } })
     expect(getChildProp(loginWrapper, 'activeIndex')).to.equal(1)
+    global.dom.reconfigure({
+      url: 'https://localhost'
+    })
   })
 })
 
diff --git a/packages/app-project/src/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js b/packages/app-project/src/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js
index ded2ff2f13..478e53dfd4 100644
--- a/packages/app-project/src/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js
+++ b/packages/app-project/src/components/ZooHeaderWrapper/ZooHeaderWrapperContainer.js
@@ -4,9 +4,8 @@ import { withRouter } from 'next/router'
 import auth from 'panoptes-client/lib/auth'
 import { bool, func, shape, string } from 'prop-types'
 import { Component } from 'react'
-import Url from 'url-parse'
 
-function storeMapper (stores) {
+function storeMapper(stores) {
   const { user } = stores.store
   return {
     user
@@ -17,51 +16,46 @@ function storeMapper (stores) {
 @inject(storeMapper)
 @observer
 class ZooHeaderWrapperContainer extends Component {
-  constructor () {
+  constructor() {
     super()
     this.openRegisterModal = this.openRegisterModal.bind(this)
     this.openSignInModal = this.openSignInModal.bind(this)
     this.signOut = this.signOut.bind(this)
   }
 
-  createUserProp () {
+  createUserProp() {
     const { user } = this.props
     return (user.isLoggedIn)
       ? { display_name: user.display_name, login: user.login }
       : {}
   }
 
-  getUrlObject () {
-    const { asPath } = this.props.router
-    return new Url(asPath, true)
+  getUrlObject() {
+    return new URL(window.location)
   }
 
-  addUrlQuery (urlObject, propertyToAdd) {
-    const query = Object.assign({}, urlObject.query, {
-      [propertyToAdd]: 'true'
-    })
-    urlObject.set('query', query)
+  addUrlQuery(urlObject, propertyToAdd) {
+    urlObject.searchParams.set(propertyToAdd, true)
   }
 
-  redirect (urlObject) {
-    const { pathname, push } = this.props.router
-    const urlString = urlObject.toString().substr(urlObject.origin.length)
-    push(pathname, urlString, { shallow: true })
+  redirect(urlObject) {
+    const { push } = this.props.router
+    push(urlObject, urlObject, { shallow: true })
   }
 
-  openRegisterModal () {
+  openRegisterModal() {
     const url = this.getUrlObject()
     this.addUrlQuery(url, 'register')
     return this.redirect(url)
   }
 
-  openSignInModal () {
+  openSignInModal() {
     const url = this.getUrlObject()
     this.addUrlQuery(url, 'login')
     return this.redirect(url)
   }
 
-  signOut () {
+  signOut() {
     return auth.signOut()
       .then(() => {
         this.props.user.clear()
@@ -79,19 +73,19 @@ class ZooHeaderWrapperContainer extends Component {
       })
   }
 
-  unreadMessages () {
+  unreadMessages() {
     const { user } = this.props
 
     return user?.personalization?.notifications?.unreadConversationsIds.length
   }
 
-  unreadNotifications () {
+  unreadNotifications() {
     const { user } = this.props
     
     return user?.personalization?.notifications?.unreadNotificationsCount
   }
 
-  render () {
+  render() {
     return (
       <ZooHeader
         {...this.props}
diff --git a/packages/lib-panoptes-js/package.json b/packages/lib-panoptes-js/package.json
index f193ed14d3..f53c2c6fc8 100644
--- a/packages/lib-panoptes-js/package.json
+++ b/packages/lib-panoptes-js/package.json
@@ -13,8 +13,7 @@
     "test:ci": "NODE_ENV=test mocha --config ./test/.mocharc.json --reporter=min \"./src/**/*.spec.js\""
   },
   "dependencies": {
-    "superagent": "~8.0.0",
-    "url-parse": "~1.5.10"
+    "superagent": "~8.0.0"
   },
   "devDependencies": {
     "@zooniverse/standard": "~1.0.0",
diff --git a/packages/lib-panoptes-js/src/resources/projects/helpers.js b/packages/lib-panoptes-js/src/resources/projects/helpers.js
index 7e97931cae..959fe50ad3 100644
--- a/packages/lib-panoptes-js/src/resources/projects/helpers.js
+++ b/packages/lib-panoptes-js/src/resources/projects/helpers.js
@@ -1,7 +1,12 @@
-const URL = require('url-parse')
+function getProjectSlugFromURL(urlArg) {
+  let parsed
 
-function getProjectSlugFromURL (urlArg) {
-  const parsed = new URL(urlArg)
+  if (urlArg.startsWith('http')) {
+    parsed = new URL(urlArg)
+  } else {
+    const path = urlArg.startsWith('/') ? urlArg : `/${urlArg}`
+    parsed = new URL(`https://www.zooniverse.org${path}`)
+  }
 
   const [projectPath, owner, project] = parsed.pathname.split('/')
     .filter(Boolean)
diff --git a/yarn.lock b/yarn.lock
index c57191522c..a60edb7a79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14205,11 +14205,6 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
 
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -16959,14 +16954,6 @@ url-loader@^4.1.1:
     mime-types "^2.1.27"
     schema-utils "^3.0.0"
 
-url-parse@~1.5.1, url-parse@~1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"