diff --git a/extra_siteinfo.module b/extra_siteinfo.module
index 5f9c9cf..93bff36 100755
--- a/extra_siteinfo.module
+++ b/extra_siteinfo.module
@@ -1,8 +1,13 @@
 <?php
+
 /**
  * @file
  * Module file for the extra_siteinfo module.
  */
+/*
+ * Bit flag on the 'Anonymous user uid' value.
+ */
+define('ANONYMOUS_USER_UID', 0);
 
 /**
  * Implements hook_help().
@@ -142,23 +147,20 @@ function extra_siteinfo_page() {
 function extra_siteinfo_get_node_data() {
   global $base_url;
   return array(
-    t('Total Number of Nodes : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('node', 'EMTPY', 'NULL'),
-        '@cd' => $base_url . '/extra-siteinfo/nodes/all',
-      )
+    t('Total Number of Nodes : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('node', 'EMTPY', 'NULL'),
+      '@cd' => $base_url . '/extra-siteinfo/nodes/all',
+        )
     ),
-    t('Number of Published nodes : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('node', '1', 'NULL'),
-        '@cd' => $base_url . '/extra-siteinfo/nodes/status/status-1',
-      )
+    t('Number of Published nodes : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('node', '1', 'NULL'),
+      '@cd' => $base_url . '/extra-siteinfo/nodes/status/status-1',
+        )
     ),
-    t('Number of Unpublished nodes : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('node', '0', 'NULL'),
-        '@cd' => $base_url . '/extra-siteinfo/nodes/status/status-0',
-      )
+    t('Number of Unpublished nodes : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('node', '0', 'NULL'),
+      '@cd' => $base_url . '/extra-siteinfo/nodes/status/status-0',
+        )
     ),
   );
 }
@@ -172,11 +174,10 @@ function extra_siteinfo_get_node_data() {
 function extra_siteinfo_get_node_type_data() {
   global $base_url;
   $nodes_of_types = array(
-    t('Total Number of Content Types : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('node_type', 'EMTPY', 'NULL'),
-        '@cd' => $base_url . '/admin/structure/types',
-      )
+    t('Total Number of Content Types : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('node_type', 'EMTPY', 'NULL'),
+      '@cd' => $base_url . '/admin/structure/types',
+        )
     ),
   );
   $nodes_of_type = extra_siteinfo_get_data('node', 'EMTPY', 'TYPE');
@@ -195,23 +196,20 @@ function extra_siteinfo_get_node_type_data() {
 function extra_siteinfo_get_users_data() {
   global $base_url;
   return array(
-    t('Total Number of Users : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('users', 'EMTPY', 'NULL'),
-        '@cd' => $base_url . '/extra-siteinfo/users/all',
-      )
+    t('Total Number of Users : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('users', 'EMTPY', 'NULL'),
+      '@cd' => $base_url . '/extra-siteinfo/users/all',
+        )
     ),
-    t('Number of Active Users : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('users', '1', 'NULL'),
-        '@cd' => $base_url . '/extra-siteinfo/users/status/1',
-      )
+    t('Number of Active Users : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('users', '1', 'NULL'),
+      '@cd' => $base_url . '/extra-siteinfo/users/status/1',
+        )
     ),
-    t('Number of Blocked Users : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('users', '0', 'NULL'),
-        '@cd' => $base_url . '/extra-siteinfo/users/status/0',
-      )
+    t('Number of Blocked Users : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('users', '0', 'NULL'),
+      '@cd' => $base_url . '/extra-siteinfo/users/status/0',
+        )
     ),
   );
 }
@@ -225,11 +223,10 @@ function extra_siteinfo_get_users_data() {
 function extra_siteinfo_get_users_role_data() {
   global $base_url;
   $users_role_data = array(
-    t('Total Number of Roles : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => extra_siteinfo_get_data('role', 'EMTPY', 'NULL'),
-        '@cd' => $base_url . '/admin/people/permissions/roles',
-      )
+    t('Total Number of Roles : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => extra_siteinfo_get_data('role', 'EMTPY', 'NULL'),
+      '@cd' => $base_url . '/admin/people/permissions/roles',
+        )
     ),
   );
   $user_role_data = extra_siteinfo_get_data('users_roles', 'EMTPY', 'ROLE');
@@ -248,17 +245,16 @@ function extra_siteinfo_get_users_role_data() {
 function extra_siteinfo_get_currently_loggedin_users_data() {
   global $base_url;
   $num_of_currently_loggedin_users = db_select('sessions', 's')
-    ->fields('s', array('uid'))
-    ->distinct()
-    ->execute()
-    ->rowCount();
+      ->fields('s', array('uid'))
+      ->distinct()
+      ->execute()
+      ->rowCount();
   return array(
     // If showing "1", then you are the only one user who is currently loggedin.
-    t('Currently logged-in users : @ex_get_data (<a href ="@cd">click here for details</a>)',
-      array(
-        '@ex_get_data' => $num_of_currently_loggedin_users,
-        '@cd' => $base_url . '/admin/reports/extra-siteinfo/currently-loggedin-users',
-      )
+    t('Currently logged-in users : @ex_get_data (<a href ="@cd">click here for details</a>)', array(
+      '@ex_get_data' => $num_of_currently_loggedin_users,
+      '@cd' => $base_url . '/admin/reports/extra-siteinfo/currently-loggedin-users',
+        )
     ),
   );
 }
@@ -275,20 +271,19 @@ function extra_siteinfo_get_data($table, $status, $type) {
     $output = array();
     if ($type == 'TYPE') {
       $type_result = db_select('node_type', 't')
-        ->fields('t', array('type', 'name'))
-        ->execute();
+          ->fields('t', array('type', 'name'))
+          ->execute();
       while ($type_record = $type_result->fetchAssoc()) {
         $node_result = db_select($table, 't')
-          ->fields('t')
-          ->condition('type', $type_record['type'], '=')
-          ->execute();
+            ->fields('t')
+            ->condition('type', $type_record['type'], '=')
+            ->execute();
         $output[$type_record['name']] = t(
-          'Number of @ex_name type nodes : @ex_count (<a href ="@cd">click here for details</a>)',
-          array(
-            '@ex_name' => $type_record['name'],
-            '@ex_count' => $node_result->rowCount(),
-            '@cd' => $base_url . '/extra-siteinfo/nodes/type/' . $type_record['type'],
-          )
+            'Number of @ex_name type nodes : @ex_count (<a href ="@cd">click here for details</a>)', array(
+          '@ex_name' => $type_record['name'],
+          '@ex_count' => $node_result->rowCount(),
+          '@cd' => $base_url . '/extra-siteinfo/nodes/type/' . $type_record['type'],
+            )
         );
       }
       return $output;
@@ -296,50 +291,57 @@ function extra_siteinfo_get_data($table, $status, $type) {
     elseif ($type == 'ROLE') {
       $count = '';
       $type_result = db_select('role', 'u')
-        ->fields('u', array('rid', 'name'))
-        ->execute();
+          ->fields('u', array('rid', 'name'))
+          ->execute();
       while ($type_record = $type_result->fetchAssoc()) {
         if ($type_record['rid'] != 1 && $type_record['rid'] != 2) {
           $node_result = db_select($table, 't')
-            ->fields('t')
-            ->condition('rid', $type_record['rid'], '=')
-            ->execute();
+              ->fields('t')
+              ->condition('rid', $type_record['rid'], '=')
+              ->execute();
           $output[$type_record['name']] = t(
-            'Number of @ex_name Users : @ex_count (<a href ="@cd">click here for details</a>)',
-            array(
-              '@ex_name' => $type_record['name'],
-              '@ex_count' => $node_result->rowCount(),
-              '@cd' => $base_url . '/extra-siteinfo/users/role/' . $type_record["rid"],
-            )
+              'Number of @ex_name Users : @ex_count (<a href ="@cd">click here for details</a>)', array(
+            '@ex_name' => $type_record['name'],
+            '@ex_count' => $node_result->rowCount(),
+            '@cd' => $base_url . '/extra-siteinfo/users/role/' . $type_record["rid"],
+              )
           );
           $count = $count + $node_result->rowCount();
         }
       }
       $count_total = db_select('users', 't')
-        ->fields('t')
-        ->execute()
-        ->rowCount();
+          ->fields('t')
+          ->execute()
+          ->rowCount();
       $output['total'] = t(
-        'Their are total @ex_count_total "authenticated role" users, in those  @ex_get_data_count users do not have any roles assigned, these users are just Authenticated user',
-        array(
-          '@ex_count_total' => $count_total,
-          '@ex_get_data_count' => $count_total - $count,
-        )
+          'Their are total @ex_count_total "authenticated role" users, in those  @ex_get_data_count users do not have any roles assigned, these users are just Authenticated user', array(
+        '@ex_count_total' => $count_total,
+        '@ex_get_data_count' => $count_total - $count,
+          )
       );
       return $output;
     }
     else {
-      return db_select($table, 't')
-        ->fields('t')
-        ->execute()
-        ->rowCount();
+      $query = db_select($table, 't');
+      $query->fields('t');
+      if ($table == "users") {
+        $query->condition('uid', ANONYMOUS_USER_UID, '!=');
+      }
+      $exe = $query->execute();
+      $result = $exe->rowCount();
+      return $result;
     }
   }
   else {
-    return db_select($table, 't')
-      ->fields('t')
-      ->condition('status', $status, '=')
-      ->execute()
-      ->rowCount();
+
+    $query = db_select($table, 't');
+    $query->fields('t');
+    $query->condition('status', $status, '=');
+    if ($table == "users") {
+      $query->condition('uid', ANONYMOUS_USER_UID, '!=');
+    }
+    $exe = $query->execute();
+    $result = $exe->rowCount();
+    return $result;
   }
 }
