diff --git a/src/components/entity/users/UserItem.js b/src/components/entity/users/UserItem.js
index c693e05..aa9cf3f 100644
--- a/src/components/entity/users/UserItem.js
+++ b/src/components/entity/users/UserItem.js
@@ -10,7 +10,7 @@ const UserItem = ({ user, onSelect }) => {
         <Pressable key={user.UserID} onPress={() => onSelect(user)}>
             <View style={styles.userItem}>
                 <Text style={styles.text}>
-                    `${user.UserFirstname} ${user.UserLastname}`
+                    {user.UserFirstname} {user.UserLastname}
                 </Text>
             </View>
         </Pressable>
diff --git a/src/components/entity/users/UserList.js b/src/components/entity/users/UserList.js
index 5d6ea47..360f5a0 100644
--- a/src/components/entity/users/UserList.js
+++ b/src/components/entity/users/UserList.js
@@ -3,30 +3,28 @@ import UserItem from "./UserItem";
 import React from "react";
 
 const UserList = ({users, onSelect}) => {
-    //   Initialisation -------------
-    //   State ----------------------
-    //   Handlers -------------------
-    //   View -----------------------
+    // Initialisation -------------
+    // State ----------------------
+    // Handlers -------------------
+    // View -----------------------
 
     return (
-        <ScrollView style={styles.usersContainer}>
-            {users.map((user) => {
-                return (
+        <ScrollView style={styles.container}>
+            {
+                users.map((user) => (
                     <UserItem
-                        module={user}
-                        key={user.UserCode}
+                        key={user.UserID}
+                        user={user}
                         onSelect={onSelect}
                     />
-                )
-            })
+                ))
             }
         </ScrollView>
     );
 };
 
-
 const styles = StyleSheet.create({
-    usersContainer: {},
+    container: {},
 });
 
-export default UserList;
\ No newline at end of file
+export default UserList;