diff --git a/package.json b/package.json
index 74cd2fc32..915490e2d 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
   },
   "dependencies": {
     "async": "^2.1.4",
-    "await-stream-ready": "^1.0.1",
     "bootstrap": "^3.3.6",
     "bootstrap-3-typeahead": "^4.0.1",
     "configstore": "^3.1.0",
diff --git a/src/components/SearchContainer/Tabs/ComputerNodeData.jsx b/src/components/SearchContainer/Tabs/ComputerNodeData.jsx
index 20d634f8d..6d4f569c0 100644
--- a/src/components/SearchContainer/Tabs/ComputerNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/ComputerNodeData.jsx
@@ -157,7 +157,12 @@ export default class ComputerNodeData extends Component {
         if (type === 'undefined'){
             return "No Data";
         }else if (obj.hasOwnProperty('low')){
-            return new Date(obj.low * 1000).toUTCString();
+            var t = obj.low;
+            if (t === 0){
+                return "Never";
+            }else{
+                return new Date(obj.low * 1000).toUTCString();
+            }
         }else if (type === 'boolean'){
             return obj.toString().toTitleCase();
         }else if (obj === ""){
diff --git a/src/components/SearchContainer/Tabs/GroupNodeData.jsx b/src/components/SearchContainer/Tabs/GroupNodeData.jsx
index 96168c493..46278264c 100644
--- a/src/components/SearchContainer/Tabs/GroupNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/GroupNodeData.jsx
@@ -197,7 +197,6 @@ export default class GroupNodeData extends Component {
                             }.bind(this)}
                         />
                     </dd>
-                    <br />
                     <h4>Group Members</h4>
                     <dt>
                         Direct Members
@@ -237,7 +236,6 @@ export default class GroupNodeData extends Component {
                             }.bind(this)}
                         />
                     </dd>
-                    <br />
                     <h4>Group Membership</h4>
                     <dt>
                         First Degree Group Membership
@@ -277,7 +275,6 @@ export default class GroupNodeData extends Component {
                             }.bind(this)}
                         />
                     </dd>
-                    <br />
                     <h4>Local Admin Rights</h4>
                     <dt>
                         First Degree Local Admin
@@ -318,7 +315,6 @@ export default class GroupNodeData extends Component {
                             }.bind(this)}
                         />
                     </dd>
-                    <br />
                     <h4>Outbound Object Control</h4>
                     <dt>
                         First Degree Object Control
@@ -358,7 +354,6 @@ export default class GroupNodeData extends Component {
                             }.bind(this)}
                         />
                     </dd>
-                    <br />
                     <h4>Inbound Object Control</h4>
                     <dt>
                         Explicit Object Controllers
diff --git a/src/components/SearchContainer/Tabs/UserNodeData.jsx b/src/components/SearchContainer/Tabs/UserNodeData.jsx
index 73f471840..27248c2c7 100644
--- a/src/components/SearchContainer/Tabs/UserNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/UserNodeData.jsx
@@ -72,7 +72,8 @@ export default class UserNodeData extends Component {
 
         var props = driver.session();
         props.run("MATCH (n:User {name:{name}}) RETURN n", {name: payload})
-            .then(function(result){                
+            .then(function(result){
+                var properties = result.records[0]._fields[0].properties;
                 this.setState({propertyMap: properties});
                 props.close();
             }.bind(this));
@@ -168,7 +169,12 @@ export default class UserNodeData extends Component {
         if (type === 'undefined'){
             return "No Data";
         }else if (obj.hasOwnProperty('low')){
-            return new Date(obj.low * 1000).toUTCString();
+            var t = obj.low;
+            if (t === 0){
+                return "Never";
+            }else{
+                return new Date(obj.low * 1000).toUTCString();
+            }
         }else if (type === 'boolean'){
             return obj.toString().toTitleCase();
         }else if (obj === ""){
@@ -216,6 +222,12 @@ export default class UserNodeData extends Component {
                     <dd>
                         {this.convertToDisplayProp("Enabled")}
                     </dd>
+                    <dt>
+                        Email
+                    </dt>
+                    <dd>
+                        {this.convertToDisplayProp("Email")}
+                    </dd>
                     <dt>
                         Service Principal Names
                     </dt>