diff --git a/main/views.py b/main/views.py
index 1ef0766..3e83126 100755
--- a/main/views.py
+++ b/main/views.py
@@ -196,6 +196,6 @@ def getall(request):
 					    'getcpus': get_cpus(),
 					    'getdisk': get_disk(),
 					    'getip': get_ipaddress(),
-					    'getusers': get_users(),
+					    #'getusers': get_users(),
 					    'time_refresh': time_refresh
 					    }, context_instance=RequestContext(request))
diff --git a/pydash/urls.py b/pydash/urls.py
index 638c9a8..3bce43c 100644
--- a/pydash/urls.py
+++ b/pydash/urls.py
@@ -16,6 +16,7 @@ urlpatterns = patterns('',
     url(r'^main/$', 'main.views.getall', name='main'),
     url(r'^info/uptime/$', 'usage.views.uptime', name='uptime'),
     url(r'^info/memory/$', 'usage.views.memusage', name='memusage'),
+    url(r'^info/users/$', 'usage.views.getusers', name='getusers'),
     url(r'^info/loadaverage/$', 'usage.views.loadaverage', name='loadaverage')
 )
 
diff --git a/templates/main.html b/templates/main.html
index 4dcde51..169a60c 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -69,7 +69,7 @@
                 <br>
               <div style="text-align:center;">
 		<b>OS:</b> <span class=""></span>{{ getplatform }}<br>
-              	<b>Uptime:</b> <span class="" id="os-uptime"></span>{{ uptime }} Hours<br>
+              	<b>Uptime:</b> <span class="" id="os-uptime"></span> Hours<br>
               	<b>Hostname:</b> <span class=""></span>{{ gethostname }}<br>
 		<b>CPU(s):</b> <span class=""></span>{{ getcpus.cpus }} x {{ getcpus.type }}
               	<br><br>
@@ -272,6 +272,9 @@ var dashboard = {};
 dashboard.getOs = function() {
 	get_os_data('/info/uptime/', "#os-uptime");
 	}
+dashboard.getUser = function() {
+	get_os_data('/info/users/', "#os-users");
+	}
 	
 var mem_ctx = $("#memoryChart").get(0).getContext("2d");
         var memChart = new Chart(mem_ctx);
@@ -303,6 +306,7 @@ var load_ctx = $("#loadChart").get(0).getContext("2d");
             window.setInterval('memory_usage()', {{ time_refresh }});
             window.setInterval('load_average()', {{ time_refresh }});
             window.setInterval('dashboard.getOs()', {{ time_refresh }});
+            window.setInterval('dashboard.getUser()', {{ time_refresh }});
         });
         
 </script>
diff --git a/templates/users.html b/templates/users.html
index 6cd7a7c..64687b4 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -1,4 +1,4 @@
-<table class="table table-hover table-condensed table-bordered" >
+<table class="table table-hover table-condensed table-bordered">
     <thead>
         <tr>
             <th>User</th>
@@ -6,8 +6,8 @@
             <th>Logged in from</th>
         </tr>
     </thead>
-    <tbody>
-    {% for user in getusers %}
+    <tbody id="os-users">
+    {% for user in online_users %}
         {% cycle '<tr>' '' ''%}
         <td>{{user}}</td>
         {% cycle '' '' '</tr>' %}
diff --git a/usage/views.py b/usage/views.py
index 98ece6a..10e0bf1 100755
--- a/usage/views.py
+++ b/usage/views.py
@@ -25,6 +25,24 @@ def uptime(request):
     response['Content-Type'] = "text/javascript"
     response.write(data)
     return response
+    
+def getusers(request):
+    """
+    Return uptime
+    """
+    if not request.user.is_authenticated():
+        return HttpResponseRedirect('/login')
+    
+    try:
+	online_users = get_users()
+    except Exception:
+	online_users = None
+	
+    data = simplejson.dumps(online_users)
+    response = HttpResponse()
+    response['Content-Type'] = "text/javascript"
+    response.write(data)
+    return response
 
 def cpuusage(request):
     """