diff --git a/web/server/vue-cli/src/components/Icons/UserIcon.vue b/web/server/vue-cli/src/components/Icons/UserIcon.vue
index fa2293c1fb..810ab74624 100644
--- a/web/server/vue-cli/src/components/Icons/UserIcon.vue
+++ b/web/server/vue-cli/src/components/Icons/UserIcon.vue
@@ -25,5 +25,7 @@ const props = defineProps({
 
 const color = useStrToColor();
 
-const userIconName = computed(() => props.value.charAt(0).toUpperCase());
+const userIconName = computed(
+  () => (props.value || "?").charAt(0).toUpperCase()
+);
 </script>
diff --git a/web/server/vue-cli/src/components/Layout/HeaderMenuItems.vue b/web/server/vue-cli/src/components/Layout/HeaderMenuItems.vue
index 26f23b779b..821694d35e 100644
--- a/web/server/vue-cli/src/components/Layout/HeaderMenuItems.vue
+++ b/web/server/vue-cli/src/components/Layout/HeaderMenuItems.vue
@@ -1,49 +1,48 @@
 <template>
-  <div>
-    <v-dialog
-      v-model="dialog"
-      width="500"
-      :scrollable="true"
-    >
-      <v-card>
-        <v-card-title
-          class="headline primary white--text"
-          primary-title
-        >
-          Credits
+  <v-dialog
+    v-model="dialog"
+    width="500"
+    :scrollable="true"
+  >
+    <v-card>
+      <v-card-title
+        class="headline primary black-text"
+        primary-title
+      >
+        Credits
 
-          <v-spacer />
+        <v-spacer />
 
-          <v-btn icon @click="dialog = false">
-            <v-icon>mdi-close</v-icon>
-          </v-btn>
-        </v-card-title>
-        <v-card-text>
-          <v-list>
-            <v-list-item
-              v-for="credit in credits"
-              :key="credit.name"
-            >
-              <template v-slot:prepend>
-                <v-btn
-                  :href="`http://github.com/${credit.github}`"
-                  target="_blank"
-                  icon
-                  color="primary"
-                >
-                  <v-icon>mdi-github</v-icon>
-                </v-btn>
-              </template>
+        <v-btn icon @click="dialog = false">
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-card-title>
+      <v-card-text>
+        <v-list>
+          <v-list-item
+            v-for="credit in credits"
+            :key="credit.name"
+          >
+            <template v-slot:prepend>
+              <v-btn
+                :href="`http://github.com/${credit.github}`"
+                target="_blank"
+                icon
+                color="primary"
+              >
+                <v-icon>mdi-github</v-icon>
+              </v-btn>
+            </template>
 
-              
-              <v-list-item-title>{{ credit.name }}</v-list-item-title>
-              <v-list-item-subtitle>{{ credit.email }}</v-list-item-subtitle>
-            </v-list-item>
-          </v-list>
-        </v-card-text>
-      </v-card>
-    </v-dialog>
+            <v-list-item-title>{{ credit.name }}</v-list-item-title>
+            <v-list-item-subtitle>{{ credit.email }}</v-list-item-subtitle>
+          </v-list-item>
+        </v-list>
+      </v-card-text>
+    </v-card>
+  </v-dialog>
 
+  <v-card>
     <v-list>
       <v-list-item
         href="http://github.com/Ericsson/codechecker"
@@ -93,7 +92,7 @@
         </v-list-item-title>
       </v-list-item>
     </v-list>
-  </div>
+  </v-card>
 </template>
 
 <script setup>
diff --git a/web/server/vue-cli/src/components/Layout/UserInfoMenu.vue b/web/server/vue-cli/src/components/Layout/UserInfoMenu.vue
index afd05966f8..c1f9c2da38 100644
--- a/web/server/vue-cli/src/components/Layout/UserInfoMenu.vue
+++ b/web/server/vue-cli/src/components/Layout/UserInfoMenu.vue
@@ -125,9 +125,16 @@ watch(currentProduct, () => {
     }));
 });
 
-onMounted(() => {
-  getLoggedInUser();
+watch(currentUser, () => {
+  if (!currentUser.value) {
+    systemPermissions.value = [];
+    return;
+  }
   fetchPermissions();
+}, { immediate: true });
+
+onMounted(async () => {
+  await getLoggedInUser();
 });
 
 function fetchPermissions() {
@@ -151,7 +158,7 @@ function logOut() {
   });
 }
 
-function getLoggedInUser() {
-  store.dispatch(GET_LOGGED_IN_USER);
+async function getLoggedInUser() {
+  await store.dispatch(GET_LOGGED_IN_USER);
 }
 </script>
\ No newline at end of file
diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/ComparedToDiffTypeFilter.vue b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/ComparedToDiffTypeFilter.vue
index bcb1ef9082..49da82498f 100644
--- a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/ComparedToDiffTypeFilter.vue
+++ b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/ComparedToDiffTypeFilter.vue
@@ -84,7 +84,8 @@ function decodeValue(diffTypeStr) {
 
 function updateReportFilter() {
   let diffTypeVal = baseSelectOptionFilter.selectedItems.value.id;
-  if (Array.isArray(baseSelectOptionFilter.selectedItems.value)) {
+  if (Array.isArray(baseSelectOptionFilter.selectedItems.value) &&
+      baseSelectOptionFilter.selectedItems.value.length !== 0) {
     diffTypeVal = baseSelectOptionFilter.selectedItems.value[0].id;
   }
   baseSelectOptionFilter.setCmpData({
diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/Items.vue b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/Items.vue
index f9f0ad6e5a..640f0a2f58 100644
--- a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/Items.vue
+++ b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/Items.vue
@@ -1,6 +1,6 @@
 <template>
   <v-card
-    elevation="0"
+    elevation="4"
   >
     <slot name="prepend-toolbar" />
 
diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/SelectOption.vue b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/SelectOption.vue
index 550649fe19..617bcecafd 100644
--- a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/SelectOption.vue
+++ b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SelectOption/SelectOption.vue
@@ -156,7 +156,7 @@ watch(menu, async show => {
       items.value = await props.fetchItems();
       reloadItems.value = false;
     }
-  } else if (!preventApply.value) {
+  } else if (!preventApply.value && items.value.length > 0) {
     applyFilters(allSelectedItems.value);
   }
 });
@@ -203,8 +203,7 @@ function filterIsChanged(_selectedItems) {
 }
 
 function cancel() {
-  preventApply.value = true;
-  menu.value = false;
+  closeMenu();
   emit("cancel");
 }
 
diff --git a/web/server/vue-cli/src/composables/useStrToColor.js b/web/server/vue-cli/src/composables/useStrToColor.js
index ff56c98f7a..968d4bef96 100644
--- a/web/server/vue-cli/src/composables/useStrToColor.js
+++ b/web/server/vue-cli/src/composables/useStrToColor.js
@@ -1,5 +1,9 @@
 export function useStrToColor() {
   const strToColor = str => {
+    if (!str) {
+      str = "?";
+    }
+
     let hash = 0;
     for (let i = 0; i < str.length; i++) {
       hash = str.charCodeAt(i) + ((hash << 5) - hash);
diff --git a/web/server/vue-cli/src/views/Login.vue b/web/server/vue-cli/src/views/Login.vue
index f789402270..8ca88ffcc7 100644
--- a/web/server/vue-cli/src/views/Login.vue
+++ b/web/server/vue-cli/src/views/Login.vue
@@ -234,7 +234,7 @@ function login() {
     error.value = false;
 
     const returnTo = route.query["return_to"];
-    router.replace(returnTo || { name: "products" });
+    router.replace(returnTo ? { path: returnTo } : { name: "products" });
   }).catch(err => {
     errorMsg.value = `Failed to log in! ${err.message}`;
     error.value = true;
diff --git a/web/server/vue-cli/src/views/Products.vue b/web/server/vue-cli/src/views/Products.vue
index 5645cf2dd8..3e9a36bcd7 100644
--- a/web/server/vue-cli/src/views/Products.vue
+++ b/web/server/vue-cli/src/views/Products.vue
@@ -31,16 +31,17 @@
             <v-spacer />
 
             <v-col cols="auto" align="right">
-              <span
-                v-if="isSuperUser"
-              >
-                <v-spacer />
-
-                <edit-announcement-btn />
+              <span>
+                <edit-announcement-btn
+                  v-if="isSuperUser"
+                />
 
-                <edit-global-permission-btn />
+                <edit-global-permission-btn
+                  v-if="isSuperUser"
+                />
 
                 <new-product-btn
+                  v-if="isSuperUser"
                   :is-super-user="isSuperUser"
                   @on-complete="onCompleteNewProduct"
                 />