diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d43a3945..8ab7d7fa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## What's New
 
 * Websocket binding in Edge Router to support connections from BrowZer-based apps that use the `ziti-sdk-js`.  Edge Routers support various configurations  including a single `tls` binding, a single `ws` binding, or having both `tls` and `ws` bindings simultaneously. If both binding types are used, they must be specified with different ports.
+* Edge Router list for current identity
+
+## Websocket Binding
 
 ```
 #   Example Edge Router config snippet (note new `ws` address type):
@@ -20,6 +23,58 @@ listeners:
 
 * Fix router memory leak: purge session from forwardTable during unroutTimeout
 
+## Edge Router List For Current Identity
+
+A new endpoint has been added which will display the list of Edge Routers an authenticated session has access to via any policy.
+The records will indicate whether the router is online, its hostname, and its supported protocols. This endpoint will not return Edge
+Routers that have not completed enrollment. Edge Routers that are offline will not have hostname and supported protocol information.
+
+Endpoint: `GET /current-identity/edge-routers`
+
+Example Output:
+```
+{
+    "data": [
+        {
+            "createdAt": "2021-01-27T20:13:18.599Z",
+            "id": "LolSlAQMq",
+            "tags": {},
+            "updatedAt": "2021-01-27T20:13:19.762Z",
+            "hostname": "",
+            "isOnline": false,
+            "name": "er1",
+            "supportedProtocols": {}
+        },
+        {
+            "createdAt": "2021-01-27T20:13:19.308Z",
+            "id": "oVzRl6kCq",
+            "tags": {},
+            "updatedAt": "2021-01-27T20:13:19.901Z",
+            "hostname": "127.0.0.1:5002",
+            "isOnline": true,
+            "name": "er2",
+            "supportedProtocols": {
+                "tls": "tls://127.0.0.1:5002",
+                "wss": "wss://127.0.0.1:5002"
+            }
+        }
+    ],
+    "meta": {
+        "filterableFields": [
+            "id",
+            "createdAt",
+            "updatedAt",
+            "name",
+        ],
+        "pagination": {
+            "limit": 10,
+            "offset": 0,
+            "totalCount": 2
+        }
+    }
+}
+```
+
 # Release 0.18.7
 
 ## What's New
diff --git a/go.mod b/go.mod
index 1206e1cc0..35d8c7071 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
 	github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19
 	github.com/michaelquigley/pfxlog v0.3.6
-	github.com/openziti/edge v0.17.57
+	github.com/openziti/edge v0.17.59
 	github.com/openziti/fabric v0.15.19
 	github.com/openziti/foundation v0.15.10
 	github.com/openziti/sdk-golang v0.15.13
diff --git a/go.sum b/go.sum
index 8cef59055..c463f79c3 100644
--- a/go.sum
+++ b/go.sum
@@ -520,11 +520,12 @@ github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/openziti/edge v0.17.56 h1:K775G+6l1GT9xwlt5UOCGteu91PTwX9jBsHm+P9okTs=
-github.com/openziti/edge v0.17.56/go.mod h1:pHFEpTmILwipHcmvMzSYDKLaWGgb5Iob/4CHp8UdppQ=
-github.com/openziti/fabric v0.15.15/go.mod h1:H2bwevoCxvJxr3xIsG9AQq9Wy+rxOMNrJTQaPzj/Pas=
+github.com/openziti/edge v0.17.59 h1:QCRWpF5De3fB/GQDcC4RNRwHZ3Xsm9tGrKrQD0LiRvk=
+github.com/openziti/edge v0.17.59/go.mod h1:tuzW9dGztEPiDY8P7a45dq+N8VA3KRDGnYIGOR+DFJE=
 github.com/openziti/fabric v0.15.18 h1:Ze/v2ZCGjo2QqA5Y+o2PP/Mcf/GLRSDGc3Ia2+2c6jw=
 github.com/openziti/fabric v0.15.18/go.mod h1:KKvO246Nk8twpNv+Mee60NVJh83eh9ZreAb3H8JEnJY=
+github.com/openziti/fabric v0.15.19 h1:8uUx+eGamZJORlhs9ik8yuqvZ2mOCd3MWuyCkot/ma0=
+github.com/openziti/fabric v0.15.19/go.mod h1:yXgrctF8VOJdHWGoC6b9dqvcQDJ8IvV9Phbs7PHQEiU=
 github.com/openziti/foundation v0.15.9/go.mod h1:34ifQ24R2EUNjakzZBKY1M4EvnOWeIYJOrJxRGdRNh4=
 github.com/openziti/foundation v0.15.10 h1:gDU2Ot2u50q+x5kkVvJqi4XjLeZRVRoVCFJjN6QCCFA=
 github.com/openziti/foundation v0.15.10/go.mod h1:34ifQ24R2EUNjakzZBKY1M4EvnOWeIYJOrJxRGdRNh4=
@@ -532,6 +533,8 @@ github.com/openziti/sdk-golang v0.15.13 h1:Pd5WqFcPxrM8o/VeqCoKeGCgL+pC9Y5dVb1tq
 github.com/openziti/sdk-golang v0.15.13/go.mod h1:L1UbvXUV7DV6a3pd50CAJqtt9z6nN53p2cKNJlHZXR8=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
+github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU=
+github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=