diff --git a/jams-react-client/src/views/Contacts/Contacts.js b/jams-react-client/src/views/Contacts/Contacts.js
index eacd028309230dda0f2de8ea7bf75cc63af7151a..7506403f83f1a4cf55ac53dcdb529bc6f5569aa8 100644
--- a/jams-react-client/src/views/Contacts/Contacts.js
+++ b/jams-react-client/src/views/Contacts/Contacts.js
@@ -368,9 +368,7 @@ export default function Users(props) {
                         fontSize="small"
                         style={{ marginRight: "10px" }}
                       />{" "}
-                      {contact.organization
-                        ? contact.organization
-                        : "No organization"}
+                      {contact.organization}
                     </li>
                   </ul>
                 </CardBody>
diff --git a/jams-react-client/src/views/Users/Users.js b/jams-react-client/src/views/Users/Users.js
index d6a08b07868691715a38ce0a1030bbd5f8ff20b5..402b7eb4702d3ee2bb10299c12a0be5725f7010b 100644
--- a/jams-react-client/src/views/Users/Users.js
+++ b/jams-react-client/src/views/Users/Users.js
@@ -337,13 +337,11 @@ export default function Users(props) {
                               {user.username}
                             </li>
                             <li>
-                              <BusinessOutlinedIcon
+                              {user.organization && <BusinessOutlinedIcon
                                 fontSize="small"
                                 style={{ marginRight: "10px" }}
-                              />{" "}
-                              {user.organization
-                                ? user.organization
-                                : "No organization"}
+                              />}{" "}
+                              {user.organization}
                             </li>
                           </ul>
                           </GridItem>