diff --git a/package-lock.json b/package-lock.json
index 9ee88e009..3aafbd3a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3097,8 +3097,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3119,14 +3118,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3141,20 +3138,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3271,8 +3265,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3284,7 +3277,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3299,7 +3291,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3307,14 +3298,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3333,7 +3322,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3414,8 +3402,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3427,7 +3414,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3513,8 +3499,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3550,7 +3535,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3570,7 +3554,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3614,14 +3597,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -3718,7 +3699,6 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-glob": "^2.0.0"
       }
@@ -4121,8 +4101,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
       "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-finite": {
       "version": "1.0.2",
@@ -4147,7 +4126,6 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-extglob": "^1.0.0"
       }
@@ -4985,7 +4963,6 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "remove-trailing-separator": "^1.0.1"
       }
diff --git a/src/components/Modals/AddEdgeModal.jsx b/src/components/Modals/AddEdgeModal.jsx
index fbcc8c44a..f898e2b4d 100644
--- a/src/components/Modals/AddEdgeModal.jsx
+++ b/src/components/Modals/AddEdgeModal.jsx
@@ -409,6 +409,7 @@ export default class AddEdgeModal extends Component {
                                 <option>Contains</option>
                                 <option>GpLink</option>
                                 <option>CanRDP</option>
+                                <option>CanPSRemote</option>
                                 <option>ExecuteDCOM</option>
                                 <option>AllowedToDelegate</option>
                             </select>
diff --git a/src/components/SearchContainer/SearchContainer.jsx b/src/components/SearchContainer/SearchContainer.jsx
index 651091694..e967c845b 100644
--- a/src/components/SearchContainer/SearchContainer.jsx
+++ b/src/components/SearchContainer/SearchContainer.jsx
@@ -900,6 +900,22 @@ export default class SearchContainer extends Component {
                             CanRDP
                         </label>
                     </div>
+                    <div>
+                        <input
+                            className='checkbox-inline'
+                            type='checkbox'
+                            name='CanPSRemote'
+                            checked={this.state.edgeincluded.CanPSRemote}
+                            onChange={this.handleChange.bind(this)}
+                        />
+                        <label
+                            onClick={this.handleChange.bind(this)}
+                            name='CanPSRemote'
+                        >
+                            {' '}
+                            CanPSRemote
+                        </label>
+                    </div>
                     <div>
                         <input
                             className='checkbox-inline'
diff --git a/src/components/SearchContainer/Tabs/ComputerNodeData.jsx b/src/components/SearchContainer/Tabs/ComputerNodeData.jsx
index 34d39b475..b277926ac 100644
--- a/src/components/SearchContainer/Tabs/ComputerNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/ComputerNodeData.jsx
@@ -376,6 +376,16 @@ class ComputerNodeData extends Component {
                         distinct
                     />
 
+                    <NodeCypherLink
+                        property='First Degree PSRemoting Users'
+                        target={this.state.label}
+                        baseQuery={
+                            'MATCH p=(n)-[r:CanPSRemote]->(m:Computer {name:{name}})'
+                        }
+                        end={this.state.label}
+                        distinct
+                    />
+
                     <NodeCypherLink
                         property='Group Delegated Remote Desktop Users'
                         target={this.state.label}
@@ -386,6 +396,16 @@ class ComputerNodeData extends Component {
                         distinct
                     />
 
+                    <NodeCypherLink
+                        property='Group Delegated PSRemoting Users'
+                        target={this.state.label}
+                        baseQuery={
+                            'MATCH p=(n)-[r1:MemberOf*1..]->(g:Group)-[r:CanPSRemote]->(m:Computer {name:{name}})'
+                        }
+                        end={this.state.label}
+                        distinct
+                    />
+
                     <NodeCypherLink
                         property='First Degree Distributed COM Users'
                         target={this.state.label}
diff --git a/src/components/SearchContainer/Tabs/GroupNodeData.jsx b/src/components/SearchContainer/Tabs/GroupNodeData.jsx
index b93a60685..b5b094124 100644
--- a/src/components/SearchContainer/Tabs/GroupNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/GroupNodeData.jsx
@@ -375,6 +375,16 @@ class GroupNodeData extends Component {
                         distinct
                     />
 
+                    <NodeCypherLink
+                        property='First Degree PSRemoting Privileges'
+                        target={this.state.label}
+                        baseQuery={
+                            'MATCH p=(m:Group {name:{name}})-[r:CanPSRemote]->(n:Computer)'
+                        }
+                        start={this.state.label}
+                        distinct
+                    />
+
                     <NodeCypherLink
                         property='Group Delegated RDP Privileges'
                         target={this.state.label}
@@ -385,6 +395,16 @@ class GroupNodeData extends Component {
                         distinct
                     />
 
+                    <NodeCypherLink
+                        property='Group Delegated PSRemoting Privileges'
+                        target={this.state.label}
+                        baseQuery={
+                            'MATCH p=(m:Group {name:{name}})-[r1:MemberOf*1..]->(g:Group)-[r2:CanPSRemote]->(n:Computer)'
+                        }
+                        start={this.state.label}
+                        distinct
+                    />
+
                     <NodeCypherLink
                         property='First Degree DCOM Privileges'
                         target={this.state.label}
diff --git a/src/components/SearchContainer/Tabs/UserNodeData.jsx b/src/components/SearchContainer/Tabs/UserNodeData.jsx
index 0a42fbe2e..9eadf9ed0 100644
--- a/src/components/SearchContainer/Tabs/UserNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/UserNodeData.jsx
@@ -403,6 +403,16 @@ class UserNodeData extends Component {
                         distinct
                     />
 
+                    <NodeCypherLink
+                        property='First Degree PSRemoting Privileges'
+                        target={this.state.label}
+                        baseQuery={
+                            'MATCH p=(m:User {name:{name}})-[r:CanPSRemote]->(n:Computer)'
+                        }
+                        start={this.state.label}
+                        distinct
+                    />
+
                     <NodeCypherLink
                         property='Group Delegated RDP Privileges'
                         target={this.state.label}
@@ -413,6 +423,17 @@ class UserNodeData extends Component {
                         distinct
                     />
 
+                    <NodeCypherLink
+                        property='Group Delegated PSRemoting Privileges'
+                        target={this.state.label}
+                        baseQuery={
+                            'MATCH p=(m:User {name:{name}})-[r1:MemberOf*1..]->(g:Group)-[r2:CanPSRemote]->(n:Computer)'
+                        }
+                        start={this.state.label}
+                        distinct
+                    />
+
+
                     <NodeCypherLink
                         property='First Degree DCOM Privileges'
                         target={this.state.label}
diff --git a/src/index.js b/src/index.js
index 30f0c49bd..b536db801 100644
--- a/src/index.js
+++ b/src/index.js
@@ -155,6 +155,7 @@ global.appStore = {
             GpLink: 'tapered',
             Owns: 'tapered',
             CanRDP: 'tapered',
+            CanPSRemote: 'tapered',
             ExecuteDCOM: 'tapered',
             ReadLAPSPassword: 'tapered',
             AllowedToDelegate: 'tapered',
@@ -191,6 +192,7 @@ global.appStore = {
             GpLink: 'line',
             Owns: 'line',
             CanRDP: 'line',
+            CanPSRemote: 'line',
             ExecuteDCOM: 'line',
             ReadLAPSPassword: 'line',
             AllowedToDelegate: 'line',
@@ -285,6 +287,7 @@ if (typeof conf.get('edgeincluded') === 'undefined') {
         WriteDacl: true,
         WriteOwner: true,
         CanRDP: true,
+        CanPSRemote: true,
         ExecuteDCOM: true,
         AllowedToDelegate: true,
         ReadLAPSPassword: true,
diff --git a/src/js/utils.js b/src/js/utils.js
index caa3fab8d..d1654fffa 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -608,6 +608,7 @@ export function buildGpoAdminJson(chunk) {
         let computers = gpoadmin.AffectedComputers;
         let localadmins = gpoadmin.LocalAdmins;
         let rdpers = gpoadmin.RemoteDesktopUsers;
+        let psremoters = gpoadmin.RemoteManagementUsers;
         let dcom = gpoadmin.DcomUsers;
 
         $.each(computers, function(_, comp){
@@ -631,6 +632,16 @@ export function buildGpoAdminJson(chunk) {
                 insert(queries, hash, statement, {comp: comp, member: member});
             })
 
+            $.each(psremoters, function(_, admin){
+                let member = admin.Name;
+                let type = admin.Type;
+                let rel = "CanPSRemote";
+                let hash = rel+type;
+                let statement = baseQuery.format(type, rel);
+
+                insert(queries, hash, statement, {comp: comp, member: member});
+            })
+
             $.each(dcom, function(_, admin){
                 let member = admin.Name;
                 let type = admin.Type;
@@ -709,6 +720,7 @@ export function buildComputerJson(chunk) {
         let properties = comp.Properties;
         let localadmins = comp.LocalAdmins;
         let rdpers = comp.RemoteDesktopUsers;
+        let psremoters = comp.RemoteManagementUsers;
         let primarygroup = comp.PrimaryGroup;
         let allowedtoact = comp.AllowedToAct;
         let dcom = comp.DcomUsers;
@@ -758,6 +770,18 @@ export function buildComputerJson(chunk) {
             insert(queries, hash, statement, p);
         });
 
+        $.each(psremoters, function(_, psremote) {
+            let aType = psremote.Type;
+            let aName = psremote.Name;
+            let rel = "CanPSRemote";
+
+            let hash = rel + aType;
+
+            let statement = baseQuery.format(aType, rel);
+            let p = { name: name, target: aName };
+            insert(queries, hash, statement, p);
+        });
+
         $.each(dcom, function(_, dcomu) {
             let aType = dcomu.Type;
             let aName = dcomu.Name;