diff --git a/ui/src/components/AuthWrapper.vue b/ui/src/components/AuthWrapper.vue
index d51feb9..5b9face 100644
--- a/ui/src/components/AuthWrapper.vue
+++ b/ui/src/components/AuthWrapper.vue
@@ -1,13 +1,15 @@
-<!--
-SPDX-FileCopyrightText: 2023 froggie <legal@frogg.ie>
-
-SPDX-License-Identifier: OSL-3.0
--->
-
 <template>
   <slot v-if="store.activeSession" />
+
   <div v-else-if="store.updatedPreviously" v-show="false">
-    {{ router.push('/login') }}
+    {{
+      router.push({
+        path: "/login",
+        query: {
+          redirect: router.currentRoute.value.fullPath
+        }
+      })
+    }}
   </div>
 </template>
 
@@ -21,6 +23,6 @@ export default {
 import { inject } from "vue";
 import { useSessionStore } from "@/assets/lib/sessionstore";
 
-const router = inject('router')
+const router = inject("router");
 const store = useSessionStore();
-</script>
+</script>
\ No newline at end of file
diff --git a/ui/src/views/LoginView.vue b/ui/src/views/LoginView.vue
index f628bcc..4f390ce 100644
--- a/ui/src/views/LoginView.vue
+++ b/ui/src/views/LoginView.vue
@@ -7,36 +7,48 @@ SPDX-License-Identifier: OSL-3.0
 <template>
   <div class="login">
     <div v-if="!store.activeSession" class="no-session">
-      <h1 class="--tr-header-h1">Login to your
+      <h1 class="--tr-header-h1">
+        Login to your
         <subjective-report-link/>
         account ✨
       </h1>
 
       <div class="DefaultView__form">
-        <FormKit type="form" @submit="submitForm" #default="{ state: { errors } }" :actions="false">
+        <FormKit
+          type="form"
+          @submit="submitForm"
+          #default="{ state: { errors } }"
+          :actions="false"
+        >
           <FormKit
-              type="text"
-              name="username"
-              id="username"
-              label="Username"
-              validation="required"
-              placeholder="lyv76"
-              :value="store.lastUsername"
+            type="text"
+            name="username"
+            id="username"
+            label="Username"
+            validation="required"
+            placeholder="lyv76"
+            :value="store.lastUsername"
           />
 
           <FormKit
-              type="password"
-              name="password"
-              id="password"
-              label="Password"
-              validation="required"
-              placeholder="----------"
+            type="password"
+            name="password"
+            id="password"
+            label="Password"
+            validation="required"
+            placeholder="----------"
           />
 
-          <FormKit type="submit" label="Login" data-next="true" :disabled="errors && submitting"/>
+          <FormKit
+            type="submit"
+            label="Login"
+            data-next="true"
+            :disabled="errors && submitting"
+          />
         </FormKit>
       </div>
     </div>
+
     <div v-else>
       <already-logged-in/>
     </div>
@@ -49,45 +61,76 @@ import LayoutDefault from "@/layouts/LayoutDefault.vue";
 export default {
   name: "LoginView",
   created() {
-    this.$emit('update:layout', LayoutDefault);
+    this.$emit("update:layout", LayoutDefault);
   }
 }
 </script>
 
 <script setup>
-import { inject, ref } from 'vue'
-import { handleMessageError, setMessage } from '@/assets/lib/message_util';
-import { useSessionStore } from '@/assets/lib/sessionstore'
+import { inject, ref } from "vue";
+import { useRoute } from "vue-router";
+
+import { handleMessageError, setMessage } from "@/assets/lib/message_util";
+import { useSessionStore } from "@/assets/lib/sessionstore";
+
 import AlreadyLoggedIn from "@/components/AlreadyLoggedIn.vue";
 import SubjectiveReportLink from "@/components/SubjectiveReportLink.vue";
 
-const axios = inject('axios')
+const axios = inject("axios");
+const router = inject("router");
+
+const route = useRoute();
+
 const store = useSessionStore();
 
 const messageSuccess = "Successfully logged in!";
+
 let success = ref(false);
 let submitting = ref(false);
 
 const submitForm = async (fields) => {
   store.lastUsername = fields.username;
+
   submitting.value = true;
 
-  // router is intentionally undefined here, because we don't actually want to redirect but do want a location set for hiding success message
-  await axios.post('/account/login', fields).then(function (response) {
-    success.value = response.status === 200;
-    submitting.value = false;
-    setMessage(response.data.msg, messageSuccess, success.value, undefined, "/login");
-  }).catch(function (error) {
-    success.value = error.response.status === 200;
-    submitting.value = false;
-    setMessage(error.response.data.msg, messageSuccess, success.value, undefined, "/login");
-    handleMessageError(error);
-  })
+  await axios.post("/account/login", fields)
+    .then(function (response) {
+      success.value = response.status === 200;
+      submitting.value = false;
+
+      setMessage(
+        response.data.msg,
+        messageSuccess,
+        success.value,
+        undefined,
+        "/login"
+      );
+    })
+    .catch(function (error) {
+      success.value = error.response.status === 200;
+
+      submitting.value = false;
+
+      setMessage(
+        error.response.data.msg,
+        messageSuccess,
+        success.value,
+        undefined,
+        "/login"
+      );
+
+      handleMessageError(error);
+    });
 
   if (success.value) {
-    store.updateSession(axios); // TODO: Make login UX less confusing
+    await store.updateSession(axios);
+
+    const redirect =
+      route.query.redirect || "/";
+
+    router.push(redirect);
   }
-}
+};
 </script>
 
 <style>
@@ -96,4 +139,4 @@ const submitForm = async (fields) => {
 
 <style scoped>
 @import url(@/assets/css/message_util.css);
-</style>
+</style>
\ No newline at end of file