diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 413d6ae9..d122f0d0 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -5367,7 +5367,11 @@
                 if (node.osdesc) { x += addDetailItem("Version", EscapeHtml(node.osdesc), s); }
                 if (hardware.windows && hardware.windows.osinfo) {
                     var m = hardware.windows.osinfo;
-                    if (m.OSArchitecture) { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); }
+                    if (m.OSArchitecture) {
+                        if (m.OSArchitecture.startsWith('32')) { x += addDetailItem("Architecture", "32-bit", s); }
+                        else if (m.OSArchitecture.startsWith('64')) { x += addDetailItem("Architecture", "64-bit", s); }
+                        else { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); }
+                    }
                 }
 
                 // Windows Security Central
diff --git a/views/default.handlebars b/views/default.handlebars
index f4b0125a..57c04a67 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -10055,7 +10055,11 @@
                 if (node.osdesc) { x += addDetailItem("Version", EscapeHtml(node.osdesc), s); }
                 if (hardware.windows && hardware.windows.osinfo) {
                     var m = hardware.windows.osinfo;
-                    if (m.OSArchitecture) { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); }
+                    if (m.OSArchitecture) {
+                        if (m.OSArchitecture.startsWith('32')) { x += addDetailItem("Architecture", "32-bit", s); }
+                        else if (m.OSArchitecture.startsWith('64')) { x += addDetailItem("Architecture", "64-bit", s); }
+                        else { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); }
+                    }
                 }
                 if (x != '') { sections.push({ name: "Operating System", html: x, img: 'software64.png'}); }
             }