diff --git a/jams-react-client/src/components/ServerParameters/ServerParameters.js b/jams-react-client/src/components/ServerParameters/ServerParameters.js
index a18eb623c19f5bb283128e04240a58cbe389f3ba..819e1cf3f1c2cc6446352be798d7396f4cf43b32 100644
--- a/jams-react-client/src/components/ServerParameters/ServerParameters.js
+++ b/jams-react-client/src/components/ServerParameters/ServerParameters.js
@@ -107,6 +107,7 @@ export default function ServerParameters(props) {
     auth.installed = true;
     auth.authenticated = true;
     auth.admin = true;
+    window.localStorage.setItem('scope', 'true');
     auth.checkDirectoryType(() => {
       history.push("/admin/users");
     });
diff --git a/jams-react-client/src/views/Users/Users.js b/jams-react-client/src/views/Users/Users.js
index ee61dca6f44ec7b0a0f10c41209bf011212c70da..c5a718d5c482a22b8a8a213d2b6ecda2eaeda034 100644
--- a/jams-react-client/src/views/Users/Users.js
+++ b/jams-react-client/src/views/Users/Users.js
@@ -189,13 +189,13 @@ export default function Users(props) {
   const handleChangePage = (e, page) => {
     searchUsers(searchValue, page);
   };
-  if (!auth.hasAdminScope()) {
+  if (!auth.hasAdminScope() && auth.getUsername() != "") {
     return (
       <div>
         <UserProfile username={auth.getUsername()} />
       </div>
     );
-  } else if (selectedProfile && auth.hasAdminScope()) {
+  } else if (selectedProfile && auth.hasAdminScope() && selectedUsername != "") {
     return (
       <div>
         <UserProfile username={selectedUsername} />