diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp
index 8d5fdf2bc0a..4f4c7df5b84 100644
--- a/ui/new/jsp/dashboard.jsp
+++ b/ui/new/jsp/dashboard.jsp
@@ -269,7 +269,7 @@
                     </div>
                     <div class="db_resourcebox_bot">
                         <div class="db_resourcebox_VMnumber running">
-                            <span>24</span> VM(s)</div>
+                            <span id="db_running_vms">?</span> VM(s)</div>
                     </div>
                 </div>
             </div>
@@ -287,7 +287,7 @@
                     </div>
                     <div class="db_resourcebox_bot">
                         <div class="db_resourcebox_VMnumber stopped">
-                            <span>24</span> VM(s)</div>
+                            <span id="db_stopped_vms">?</span> VM(s)</div>
                     </div>
                 </div>
             </div>
@@ -305,7 +305,7 @@
                     </div>
                     <div class="db_resourcebox_bot">
                         <div class="db_resourcebox_VMnumber total">
-                            <span>48</span> VM(s)</div>
+                            <span id="db_total_vms">?</span> VM(s)</div>
                     </div>
                 </div>
             </div>
@@ -422,7 +422,7 @@
             </div>
             <div class="grid_row_cell" style="width: 60%; border: none;">
                 <div class="row_celltitles">
-                    <strong>3</strong></div>
+                    <strong id="db_account_id"></strong></div>
             </div>
         </div>
         <div class="dbaccounts_rows">
@@ -432,7 +432,7 @@
             </div>
             <div class="grid_row_cell" style="width: 60%; border: none;">
                 <div class="row_celltitles">
-                    <strong>Niki</strong></div>
+                    <strong id="db_account"></strong></div>
             </div>
         </div>
         <div class="dbaccounts_rows">
@@ -442,7 +442,7 @@
             </div>
             <div class="grid_row_cell" style="width: 60%; border: none;">
                 <div class="row_celltitles">
-                    <strong>User</strong></div>
+                    <strong id="db_type"></strong></div>
             </div>
         </div>
         <div class="dbaccounts_rows">
@@ -452,7 +452,7 @@
             </div>
             <div class="grid_row_cell" style="width: 60%; border: none;">
                 <div class="row_celltitles">
-                    <strong>Root</strong></div>
+                    <strong id="db_domain"></strong></div>
             </div>
         </div>
     </div>
diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js
index aa9c28b777b..b4f8deb2985 100644
--- a/ui/new/scripts/cloud.core2.dashboard.js
+++ b/ui/new/scripts/cloud.core2.dashboard.js
@@ -210,6 +210,73 @@ function afterLoadDashboardJSP() {
 	} 
 	else if(isUser()) {	
 	    showDashboard("dashboard_user");
+	    	    
+	    //$("#launch_test").hide();
+		$.ajax({
+			cache: false,
+			data: createURL("command=listAccounts"),
+			dataType: "json",
+			success: function(json) {
+			    var accounts = json.listaccountsresponse.account;						
+				if (accounts != null && accounts.length > 0) {
+				    var statJSON = accounts[0];
+				    /*
+				    var sent = parseInt(statJSON.sentbytes);
+				    var rec = parseInt(statJSON.receivedbytes);
+					
+					if(sent==0 && rec==0)
+					    $("#network_bandwidth_panel").hide();
+					else
+					    $("#network_bandwidth_panel").show();
+					
+				    $("#menutab_role_user").show();
+				    $("#menutab_role_root").hide();
+					$("#menutab_role_domain").hide();
+				    $("#tab_dashboard_user").show();
+				    $("#tab_dashboard_root, #tab_dashboard_domain, #loading_gridtable").hide();
+					
+				    // This is in bytes, so let's change to KB
+				    sent = Math.round(sent / 1024);
+				    rec = Math.round(rec / 1024);
+				    $("#db_sent").text(sent + "KB");
+				    $("#db_received").text(rec + "KB");
+				    $("#db_available_public_ips").text(statJSON.ipavailable);
+				    $("#db_owned_public_ips").text(statJSON.iptotal);
+				    */
+				    $("#db_running_vms").text(statJSON.vmrunning);
+				    $("#db_stopped_vms").text(statJSON.vmstopped);
+				    $("#db_total_vms").text(statJSON.vmtotal);
+				    //$("#db_avail_vms").text(statJSON.vmavailable);						   
+				    $("#db_account_id").text(statJSON.id);
+				    $("#db_account").text(statJSON.name);						    
+				    $("#db_type").text(toRole(statJSON.accounttype));
+				    $("#db_domain").text(statJSON.domain);						    			   
+				}
+				
+				// Events
+				$.ajax({
+				    data: createURL("command=listEvents&level=ERROR"),
+					dataType: "json",
+					success: function(json) {
+						var events = json.listeventsresponse.event;
+						if (events != null && events.length > 0) {
+							var errorGrid = $("#error_grid_content").empty();
+							var length = (events.length>=3) ? 3 : events.length;
+							for (var i = 0; i < length; i++) {
+								var errorTemplate = $("#recent_error_template").clone(true);
+								errorTemplate.find("#db_error_type").text(events[i].type);
+								errorTemplate.find("#db_error_msg").text(fromdb(events[i].description));										
+								setDateField(events[i].created, errorTemplate.find("#db_error_date"));									
+								errorGrid.append(errorTemplate.show());
+							}
+						}
+					}
+				});
+			},					
+			beforeSend: function(XMLHttpRequest) {
+				return true;
+			}	
+		});	      
 	} 
 	else { //no role 
 	    logout(false);