diff --git a/client/src/components/UsersModal.tsx b/client/src/components/UsersModal.tsx
index 0cf92a5..efe671f 100644
--- a/client/src/components/UsersModal.tsx
+++ b/client/src/components/UsersModal.tsx
@@ -6,6 +6,7 @@ import { FilterBar } from "./FilterBar";
 import { HttpResponse } from "../types/HttpResponse";
 import { get } from "../utils/http";
 import { Constants } from "../utils/Constants";
+import { UsersModalEntry } from "./UsersModalEntry";
 
 interface IProps {
   show: boolean;
@@ -15,12 +16,13 @@ interface IProps {
 
 export const UsersModal: FC<IProps> = ({ show, handleClose, users }) => {
   const [filterText, setFilterText] = useState<string>("");
+  const [allUsers, setAllUsers] = useState<User[]>([]);
+  const [isChecked, setIsChecked] = useState(true);
   const handleChange: (e: ChangeEvent<HTMLInputElement>) => void = (
     e: ChangeEvent<HTMLInputElement>
   ) => {
     setFilterText(e.target.value);
   };
-  const [allUsers, setAllUsers] = useState();
 
   async function httpGet(): Promise<void> {
     try {
@@ -28,8 +30,7 @@ export const UsersModal: FC<IProps> = ({ show, handleClose, users }) => {
         `${Constants.usersURI}`
       );
       if (response.parsedBody !== undefined) {
-        setAllUsers(response.parsedBody);
-        // setIsLoading(false);
+        setAllUsers((response.parsedBody as unknown) as User[]);
       }
     } catch (ex) {
       // setHasError(true);
@@ -72,28 +73,16 @@ export const UsersModal: FC<IProps> = ({ show, handleClose, users }) => {
       {/* <div className="code">{allUsers}</div> */}
       <form>
         <ul>
-          {users.map((u: User) => (
+          {allUsers.map((u: User) => (
             <li key={u.id}>
-              <div className="row">
-                <input
-                  id={u.id}
-                  type="checkbox"
-                  name="active"
-                  value="true"
-                  onChange={() => false}
-                  // checked
-                />
-                <span>
-                  {u.fullName}
-                  <img
-                    className="circle"
-                    src={u.picture}
-                    width="32vh"
-                    height="32vh"
-                    alt={u.fullName}
-                  />
-                </span>
-              </div>
+              {console.log(isChecked)}
+              <UsersModalEntry
+                user={u}
+                isChecked={isChecked}
+                onChange={(e: ChangeEvent<HTMLInputElement>) => {
+                  setIsChecked(!isChecked);
+                }}
+              />
             </li>
           ))}
         </ul>
diff --git a/client/src/components/UsersModalEntry.tsx b/client/src/components/UsersModalEntry.tsx
new file mode 100644
index 0000000..f6821ab
--- /dev/null
+++ b/client/src/components/UsersModalEntry.tsx
@@ -0,0 +1,31 @@
+import React, { FC, ChangeEvent } from "react";
+import { User } from "../types/User";
+
+interface IProps {
+  isChecked: boolean;
+  onChange: (e: ChangeEvent<HTMLInputElement>) => void;
+  user: User;
+}
+
+export const UsersModalEntry: FC<IProps> = ({ user, isChecked, onChange }) => {
+  return (
+    <div className="row">
+      <input
+        id={user.id}
+        type="checkbox"
+        onChange={onChange}
+        checked={isChecked}
+      />
+      <span>
+        {user.fullName}
+        <img
+          className="circle"
+          src={user.picture}
+          width="32vh"
+          height="32vh"
+          alt={user.fullName}
+        />
+      </span>
+    </div>
+  );
+};