diff --git a/pages/login.vue b/pages/login.vue
index 9899a87..485166d 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,6 +1,6 @@
 <template>
   <NuxtLayout>
-    <form @submit="login">
+    <form @submit="formLogin">
       <div>
         <label for="username">Username/Email</label>
         <br>
@@ -18,12 +18,6 @@
     <div>
       Don't have an account? <NuxtLink href="/register">Register</NuxtLink> one!
     </div>
-    <div v-if="response">
-      Response:
-      <p>
-        {{ response }}
-      </p>
-    </div>
   </NuxtLayout>
 </template>
 
@@ -38,44 +32,14 @@ const form = reactive({
   password: "",
 });
 
-const response = ref();
-
 //const authStore = useAuthStore();
-const accessToken = useCookie("access_token");
-const refreshToken = useCookie("refresh_token");
-const redirectTo = useRoute().query.redirect_to;
 
-console.log("access token:", accessToken.value);
-console.log("refresh token:", refreshToken.value);
+const { login } = useAuth();
 
-onMounted(() => {
-  console.log("accessToken:", accessToken.value);
-  console.log("refreshToken:", refreshToken.value);
-
-  if (accessToken.value) {
-    //return navigateTo(redirectTo ? redirectTo as string : useAppConfig().baseURL as string);
-  }
-});
-
-const apiVersion = useRuntimeConfig().public.apiVersion;
-
-async function login(e: Event) {
+async function formLogin(e: Event) {
   e.preventDefault();
   console.log("Sending login data");
-  const hashedPass = await hashPassword(form.password);
-  console.log("hashedPass:", hashedPass);
-  //authStore.setAccessToken(accessToken);
-  const res = await $fetch(`/api/v${apiVersion}/auth/login`, {
-    method: "POST", body:
-    {
-      username: form.username, password: hashedPass
-    }
-  }) as { access_token: string, refresh_token: string };
-  response.value = res;
-  accessToken.value = res.access_token;
-  console.log("set access token:", accessToken.value);
-  const refreshToken = useCookie("refresh_token", { secure: true, httpOnly: false });
-  refreshToken.value = res.refresh_token;
+  await login(form.username, form.password, "Linux Laptop");
   //return navigateTo(redirectTo ? redirectTo as string : useAppConfig().baseURL as string);
 }
 
diff --git a/pages/register.vue b/pages/register.vue
index 48fae6b..cd17005 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -24,7 +24,7 @@
         <input type="password" name="password" id="password" v-model="form.password">
       </div>
       <div>
-        <label for="repeat-password">Password</label>
+        <label for="repeat-password">Repeat password</label>
         <br>
         <input type="password" name="repeat-password" id="repeat-password" v-model="form.repeatPassword">
       </div>
@@ -35,12 +35,6 @@
     <div>
       Already have an account? <NuxtLink href="/login">Log in</NuxtLink>!
     </div>
-    <div v-if="response">
-      Response:
-      <p>
-        {{ response }}
-      </p>
-    </div>
   </NuxtLayout>
 </template>
 
@@ -57,8 +51,6 @@ const form = reactive({
   repeatPassword: ""
 });
 
-const response = ref();
-
 /*
 const errorMessages = reactive({
   username: {
@@ -81,18 +73,11 @@ const errorMessages = reactive({
 */
 
 //const authStore = useAuthStore();
-const accessToken = useCookie("access_token");
-const refreshToken = useCookie("refresh_token");
+const auth = useAuth();
 const redirectTo = useRoute().query.redirect_to;
 
-console.log("access token:", accessToken.value);
-console.log("refresh token:", refreshToken.value);
-
 onMounted(() => {
-  console.log("accessToken:", accessToken.value);
-  console.log("refreshToken:", refreshToken.value);
-
-  if (accessToken.value) {
+  if (auth.accessToken.value) {
     //return navigateTo(redirectTo ? redirectTo as string : useAppConfig().baseURL as string);
   }
 });
@@ -135,19 +120,7 @@ const apiVersion = useRuntimeConfig().public.apiVersion;
 async function register(e: Event) {
   e.preventDefault();
   console.log("Sending registration data");
-  const hashedPass = await hashPassword(form.password);
-  const res = await $fetch(`/api/v${apiVersion}/auth/register`, {
-    method: "POST", body:
-    {
-      email: form.email, username: form.username, password: hashedPass
-    }
-  }) as { access_token: string, refresh_token: string };
-  response.value = res;
-  //authStore.setAccessToken(accessToken);
-  accessToken.value = res.access_token;
-  console.log("set access token:", accessToken.value);
-  const refreshToken = useCookie("refresh_token", { secure: true, httpOnly: false });
-  refreshToken.value = res.refresh_token;
+  await auth.register(form.username, form.email, form.password);
   //return navigateTo(redirectTo ? redirectTo as string : useAppConfig().baseURL as string);
 }