diff --git a/src/components/Cards/CardRequesterRequestDetails.svelte b/src/components/Cards/CardRequesterRequestDetails.svelte
index 9ed6a9a..f485304 100644
--- a/src/components/Cards/CardRequesterRequestDetails.svelte
+++ b/src/components/Cards/CardRequesterRequestDetails.svelte
@@ -102,14 +102,14 @@
               <p class="text-blueGray-700 text-sm font-bold">
                 Supporting Documents
               </p>
-              <CardRequestDocuments requestDocs={files.filter((file)=> file.FileURL.includes('/supporting-documents/'))}/>
+              <CardRequestDocuments requestDocs={files.filter((file)=> file.Folder ==='supporting-documents')}/>
             </div>
             {#if data.Status.toLowerCase() === 'complete'}
             <div class="px-6 py-6 border-t border-blueGray-200">
               <p class="text-blueGray-700 text-sm font-bold">
                 Request Outputs
               </p>
-              <CardRequestDocuments requestDocs={files.filter((file)=> !file.FileURL.includes('/supporting-documents/'))}/>
+              <CardRequestDocuments requestDocs={files.filter((file)=> !file.Folder !=='supporting-documents')}/>
             </div>
               {/if}
 
diff --git a/src/views/user/UserRequestForm.svelte b/src/views/user/UserRequestForm.svelte
index bc71ebe..e0c07f8 100644
--- a/src/views/user/UserRequestForm.svelte
+++ b/src/views/user/UserRequestForm.svelte
@@ -1,5 +1,6 @@
 <script>
   import Swal from 'sweetalert2';
+  import {auth} from "../../authentication/AuthStore";
   const env = process.env.config;
 
   let files = [];
@@ -34,8 +35,9 @@
       }
 
       let datedue = new Date(deadline).toISOString()
-      // TODO: Use id of user
-      let requestor_id = '79191307-1516-4b32-84bb-d0ebf8967d2d'
+      
+      let requestor_id = null;
+      auth.id.subscribe((value) => requestor_id = value)
       try {
         let response = await fetch(`${env.API_ENDPOINT}/request/create`, {
           method: 'POST',