diff --git a/languages/en_CA.json b/languages/en_CA.json
index f4e9b5d8..fa1ff459 100644
--- a/languages/en_CA.json
+++ b/languages/en_CA.json
@@ -54,6 +54,7 @@
    "Power Video Viewer": "Power Video Viewer",
    "Time-lapse": "Time-lapse",
    "Montage": "Montage",
+   "Registered": "Registered",
    "Open All Monitors": "Open All Monitors",
    "Accounts": "Accounts",
    "Settings": "Settings",
diff --git a/web/libs/css/super.easyRemoteAccess.css b/web/libs/css/super.easyRemoteAccess.css
index cbcf2f16..bb3aaba7 100644
--- a/web/libs/css/super.easyRemoteAccess.css
+++ b/web/libs/css/super.easyRemoteAccess.css
@@ -38,8 +38,11 @@
 }
 #easyRemoteAccess .card .selected-badge {
     display: none;
+    color: #fff!important;
+    background: #054e9f;
+    border: 1px solid #054e9f;
 }
-#easyRemoteAccess .card.active .selected-badge {
+#easyRemoteAccess .card.selected .selected-badge {
     display: inline-block;
 }
 #easyRemoteAccess .card.active .table-striped tbody tr:nth-of-type(odd) {
diff --git a/web/libs/js/super.easyRemoteAccess.js b/web/libs/js/super.easyRemoteAccess.js
index 669bd34d..7c8c2046 100644
--- a/web/libs/js/super.easyRemoteAccess.js
+++ b/web/libs/js/super.easyRemoteAccess.js
@@ -3,6 +3,7 @@ $(document).ready(function(){
     var p2pHostSelectedContainer = $('#p2pHostSelected')
     var easyRemoteAccessForm = easyRemoteAccessTab.find('form')
     var loadingRegistration = false
+    var currentlyRegisteredP2PServer = currentlySelectedP2PServerId ? currentlySelectedP2PServerId + '' : undefined
     function copyToClipboard(str) {
         const el = document.createElement('textarea');
         el.value = str;
@@ -58,6 +59,16 @@ $(document).ready(function(){
         loadingRegistration = false
         easyRemoteAccessTab.find('.remote-dashboard-link').html(`<i class="fa fa-external-link"></i> ` + lang['Open Remote Dashboard'])
         easyRemoteAccessTab.find('.remote-dashboard-link-copy').html(`<i class="fa fa-copy"></i> ` + lang['Copy Remote Link'])
+        displayCurrentlySelectedInternally()
+    }
+    function displayCurrentlySelectedInternally(){
+        var selectedServer = p2pServerList[currentlyRegisteredP2PServer]
+        if(selectedServer){
+            var key = selectedServer.key
+            var cardEl = easyRemoteAccessTab.find(`[drawn-id="${key}"]`)
+            easyRemoteAccessTab.find(`[drawn-id].selected`).removeClass('selected')
+            cardEl.addClass('selected')
+        }
     }
     easyRemoteAccessTab.find('.submit').click(function(){
         easyRemoteAccessForm.submit()
@@ -73,6 +84,7 @@ $(document).ready(function(){
         },function(data){
             console.log(data)
             if(data.ok){
+                currentlyRegisteredP2PServer = currentlySelectedP2PServerId + ''
                 new PNotify({
                     type: 'success',
                     title: lang['P2P Settings Applied'],
@@ -94,7 +106,7 @@ $(document).ready(function(){
         e.preventDefault()
         if(!loadingRegistration){
             var apiKey = easyRemoteAccessForm.find('[name="p2pApiKey"]').val()
-            var selectedServer = p2pServerList[currentlySelectedP2PServerId]
+            var selectedServer = p2pServerList[currentlyRegisteredP2PServer]
             console.log(selectedServer,currentlySelectedP2PServerId,p2pServerList)
             if(selectedServer && selectedServer.host){
                 var href = `http://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}?p2p=1`
@@ -114,7 +126,7 @@ $(document).ready(function(){
         e.preventDefault()
         if(!loadingRegistration){
             var apiKey = easyRemoteAccessForm.find('[name="p2pApiKey"]').val()
-            var selectedServer = p2pServerList[currentlySelectedP2PServerId]
+            var selectedServer = p2pServerList[currentlyRegisteredP2PServer]
             console.log(selectedServer,currentlySelectedP2PServerId,p2pServerList)
             if(selectedServer && selectedServer.host){
                 var href = `http://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}?p2p=1`
@@ -135,6 +147,8 @@ $(document).ready(function(){
         return false;
     })
     $.each(p2pServerList,function(key,server){
+        server.key = key
         beginStatusConnectionForServer(key,server)
     })
+    displayCurrentlySelectedInternally()
 })
diff --git a/web/pages/blocks/easyRemoteAccess.ejs b/web/pages/blocks/easyRemoteAccess.ejs
index 2d5e43c8..5e20be45 100644
--- a/web/pages/blocks/easyRemoteAccess.ejs
+++ b/web/pages/blocks/easyRemoteAccess.ejs
@@ -64,7 +64,7 @@
                 <div class="col-md-4 mt-2">
                     <div class="card <% if(config.p2pHostSelected === key){ %>active<% } %>" drawn-id="<%- key %>">
                         <div class="card-header" style="min-height:auto">
-                            <!-- <span class="badge badge-sm badge-danger pull-right selected-badge"><%- lang.Selected %></span> -->
+                            <span class="badge badge-sm badge-danger pull-right selected-badge"><%- lang.Selected %></span>
                             <span class="badge badge-sm badge-info name-badge"><%- details.name %></span>
                         </div>
                         <div style="min-height:auto">