diff --git a/resources/views/user-selector.blade.php b/resources/views/user-selector.blade.php
index ca0e588..7a2f025 100644
--- a/resources/views/user-selector.blade.php
+++ b/resources/views/user-selector.blade.php
@@ -29,13 +29,13 @@
                 <option disabled selected>Sudo Su</option>
 
                 @foreach ($users as $user)
-                    <option value="{{ $user->id }}">{{ $user->name }}</option>
+                    <option value="{{ $user->getKey($user->getKeyName()) }}">{{ $user->name }}</option>
                 @endforeach
             </select>
             
             {!! csrf_field() !!}
 
-            <input type="hidden" name="originalUserId" value="{{ $originalUser->id ?? null }}">
+            <input type="hidden" name="originalUserId" value="{{ $originalUser->getKey($originalUser->getKeyName()) ?? null }}">
         </form>
     </div>
 </div>
@@ -45,4 +45,4 @@
     const element = document.getElementById('sudosu-js-interface');
 
     btn.addEventListener('click', event => element.classList.toggle('hidden'));
-</script>
\ No newline at end of file
+</script>
diff --git a/src/SudoSu.php b/src/SudoSu.php
index 75070d4..de96ffd 100644
--- a/src/SudoSu.php
+++ b/src/SudoSu.php
@@ -89,7 +89,7 @@ public function getOriginalUser()
 
         $userId = $this->session->get($this->sessionKey);
 
-        return $this->getUsers()->where('id', $userId)->first();
+        return $this->getUsers()->find($userId);
     }
 
     public function hasSudoed()