diff --git a/index.html b/index.html
index 7ae349e9..d272ce67 100644
--- a/index.html
+++ b/index.html
@@ -227,7 +227,7 @@ function laststatus( data, type, row ) {
 }
 
 function clientInfo( data, type, row ) {
-   var  tooltip  = "CPU: " + row.client_status.cpu_brand;
+   var  tooltip  = "CPU: " + row.client_status.cpu_brand + " [" + row.client_status.cpu_cores + " cores]";
         tooltip += '\n';
         tooltip += "CPU Flags: " + (row.client_status.cpu_has_aes ? "AES-NI " : "");
         tooltip += (row.client_status.cpu_is_x64 ? "x64" : "");
@@ -237,7 +237,7 @@ function clientInfo( data, type, row ) {
         tooltip += "Huge Pages: " + (row.client_status.hugepages_available ? " available, " : " unavailable, ");
         tooltip += (row.client_status.hugepages_enabled ? "enabled" : "disabled");
         tooltip += '\n';
-        tooltip += "Threads: " + row.client_status.current_threads;
+        tooltip += "Used Threads: " + row.client_status.current_threads;
         tooltip += (row.client_status.double_hash_mode ? " [double hash mode]" :"");
         tooltip += '\n';
         tooltip += "Client IP: " + row.client_status.external_ip;
diff --git a/src/cc/CCClient.cpp b/src/cc/CCClient.cpp
index 69d4b672..3cccfbb1 100644
--- a/src/cc/CCClient.cpp
+++ b/src/cc/CCClient.cpp
@@ -82,7 +82,7 @@ CCClient::CCClient(const Options *options)
 
     m_clientStatus.setCpuL2(Cpu::l2());
     m_clientStatus.setCpuL3(Cpu::l3());
-    m_clientStatus.setCurrentThreads(Cpu::threads());
+    m_clientStatus.setCurrentThreads(m_options->threads());
 
     if (m_options->ccToken() != nullptr) {
         m_authorization = std::string("Bearer ") + m_self->m_options->ccToken();