diff --git a/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx b/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx
index abae1cbe1..72b99929d 100644
--- a/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx
+++ b/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx
@@ -42,7 +42,7 @@ function UserListItem(props: Props) {
       onClick={editHandler}
     >
       <div className="col-span-5">
-        <span className="mr-2">{user.name}</span>
+        <span className="mr-2 capitalize">{user.name}</span>
         {/* {isEnterprise && <AdminPrivilegeLabel user={user} />} */}
       </div>
       <div className="col-span-3">
diff --git a/frontend/app/components/hocs/withSiteIdUpdater.js b/frontend/app/components/hocs/withSiteIdUpdater.js
index 1c4e038ae..0849bbd84 100644
--- a/frontend/app/components/hocs/withSiteIdUpdater.js
+++ b/frontend/app/components/hocs/withSiteIdUpdater.js
@@ -19,7 +19,7 @@ export default (BaseComponent) => {
     }
     componentDidUpdate(prevProps) {
       const { urlSiteId, siteId, location: { pathname }, history } = this.props;
-      const shouldUrlUpdate = urlSiteId && urlSiteId !== siteId;
+      const shouldUrlUpdate = urlSiteId && parseInt(urlSiteId, 10) !== parseInt(siteId, 10);
       if (shouldUrlUpdate) {
         const path = ['', siteId].concat(pathname.split('/').slice(2)).join('/');
         history.push(path);
@@ -37,4 +37,4 @@ export default (BaseComponent) => {
   }
 
   return WrapperClass
-}
\ No newline at end of file
+}