diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 85369f60c..09eb2a425 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.54</Version>
+		<Version>1.0.2.55</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/BTCPayServer/Controllers/ServerController.cs b/BTCPayServer/Controllers/ServerController.cs
index 773543876..6ef7db45c 100644
--- a/BTCPayServer/Controllers/ServerController.cs
+++ b/BTCPayServer/Controllers/ServerController.cs
@@ -298,8 +298,7 @@ namespace BTCPayServer.Controllers
             var model = new LNDGRPCServicesViewModel();
             var external = GetExternalLNDConnectionString(connectionString);
 
-            model.Host = external.BaseUri.DnsSafeHost;
-            model.Port = external.BaseUri.Port;
+            model.Host = $"{external.BaseUri.DnsSafeHost}:{external.BaseUri.Port}";
             model.SSL = external.BaseUri.Scheme == "https";
             if (external.CertificateThumbprint != null)
             {
@@ -314,7 +313,8 @@ namespace BTCPayServer.Controllers
                 var lnConfig = _LnConfigProvider.GetConfig(secret.Value);
                 if (lnConfig != null)
                 {
-                    model.QRCode = $"config={this.Request.GetAbsoluteRoot().WithTrailingSlash()}lnd-config/{secret.Value}/lnd.config";
+                    model.QRCodeLink = $"{this.Request.GetAbsoluteRoot().WithTrailingSlash()}lnd-config/{secret.Value}/lnd.config";
+                    model.QRCode = $"config={model.QRCodeLink}";
                 }
             }
             return View(model);
diff --git a/BTCPayServer/Models/ServerViewModels/LNDGRPCServicesViewModel.cs b/BTCPayServer/Models/ServerViewModels/LNDGRPCServicesViewModel.cs
index 12c4074bb..01f78bd3b 100644
--- a/BTCPayServer/Models/ServerViewModels/LNDGRPCServicesViewModel.cs
+++ b/BTCPayServer/Models/ServerViewModels/LNDGRPCServicesViewModel.cs
@@ -8,10 +8,10 @@ namespace BTCPayServer.Models.ServerViewModels
     public class LNDGRPCServicesViewModel
     {
         public string Host { get; set; }
-        public int Port { get; set; }
         public bool SSL { get; set; }
         public string Macaroon { get; set; }
         public string CertificateThumbprint { get; set; }
         public string QRCode { get; set; }
+        public string QRCodeLink { get; set; }
     }
 }
diff --git a/BTCPayServer/Properties/launchSettings.json b/BTCPayServer/Properties/launchSettings.json
index 3ffbd3c4e..90d45afd9 100644
--- a/BTCPayServer/Properties/launchSettings.json
+++ b/BTCPayServer/Properties/launchSettings.json
@@ -3,16 +3,17 @@
     "Docker-Regtest": {
       "commandName": "Project",
       "launchBrowser": true,
-      "environmentVariables": {
-        "BTCPAY_NETWORK": "regtest",
-        "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
-        "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "BTCPAY_CHAINS": "btc,ltc",
-        "BTCPAY_BTCLIGHTNING": "http://api-token:foiewnccewuify@127.0.0.1:54938/",
-        "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver",
-        "BTCPAY_BUNDLEJSCSS": "false"
-      },
+        "environmentVariables": {
+            "BTCPAY_NETWORK": "regtest",
+            "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
+            "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
+            "ASPNETCORE_ENVIRONMENT": "Development",
+            "BTCPAY_CHAINS": "btc,ltc",
+            "BTCPAY_BTCLIGHTNING": "http://api-token:foiewnccewuify@127.0.0.1:54938/",
+            //"BTCPAY_BTCLIGHTNING": "type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true",
+            "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver",
+            "BTCPAY_BUNDLEJSCSS": "false"
+        },
       "applicationUrl": "http://127.0.0.1:14142/"
     }
   }
diff --git a/BTCPayServer/Views/Server/LNDGRPCServices.cshtml b/BTCPayServer/Views/Server/LNDGRPCServices.cshtml
index 991782582..1b04a47a3 100644
--- a/BTCPayServer/Views/Server/LNDGRPCServices.cshtml
+++ b/BTCPayServer/Views/Server/LNDGRPCServices.cshtml
@@ -31,49 +31,59 @@
         <div class="form-group">
             @if(Model.QRCode == null)
             {
-                <form method="post">
-                    <button type="submit" class="btn btn-primary">Show QR Code</button>
-                </form>
+                <div class="form-group">
+                    <form method="post">
+                        <button type="submit" class="btn btn-primary">Show QR Code</button>
+                    </form>
+                </div>
             }
             else
-            {
-                <div id="qrCode"></div>
-                <div id="qrCodeData" data-url="@Html.Raw(Model.QRCode)"></div>
-
-            }
-        </div>
-
-        <div class="form-group">
-            <h5>More details...</h5>
-            <p>Alternatively, you can see the settings by clicking <a href="#details" data-toggle="collapse">here</a></p>
-        </div>
-        <div id="details" class="collapse">
-            <div class="form-group">
-                <label asp-for="Host"></label>
-                <input asp-for="Host" readonly class="form-control" />
-            </div>
-            <div class="form-group">
-                <label asp-for="Port"></label>
-                <input asp-for="Port" readonly class="form-control" />
-            </div>
-            <div class="form-group">
-                <label asp-for="SSL"></label>
-                <input asp-for="SSL" disabled type="checkbox" class="form-check-inline" />
-            </div>
-            @if(Model.Macaroon != null)
             {
                 <div class="form-group">
-                    <label asp-for="Macaroon"></label>
-                    <input asp-for="Macaroon" readonly class="form-control" />
+                    <div id="qrCode"></div>
+                    <div id="qrCodeData" data-url="@Html.Raw(Model.QRCode)"></div>
+                </div>
+                <p>See QR Code information by clicking <a href="#detailsQR" data-toggle="collapse">here</a></p>
+                <div id="detailsQR" class="collapse">
+                    <div class="form-group">
+                        <label>QR Code data</label>
+                        <input asp-for="QRCode" readonly class="form-control" />
+                    </div>
+                    <div class="form-group">
+                        Click <a href="@Model.QRCodeLink" target="_blank">here</a> to open the configuration file.
+                    </div>
                 </div>
             }
-            @if(Model.CertificateThumbprint != null)
-            {
+
+
+            <div class="form-group">
+                <h5>More details...</h5>
+                <p>Alternatively, you can see the settings by clicking <a href="#details" data-toggle="collapse">here</a></p>
+            </div>
+            <div id="details" class="collapse">
                 <div class="form-group">
-                    <label asp-for="CertificateThumbprint"></label>
-                    <input asp-for="CertificateThumbprint" readonly class="form-control" />
+                    <label asp-for="Host"></label>
+                    <input asp-for="Host" readonly class="form-control" />
                 </div>
-            }
+                <div class="form-group">
+                    <label asp-for="SSL"></label>
+                    <input asp-for="SSL" disabled type="checkbox" class="form-check-inline" />
+                </div>
+                @if(Model.Macaroon != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="Macaroon"></label>
+                        <input asp-for="Macaroon" readonly class="form-control" />
+                    </div>
+                }
+                @if(Model.CertificateThumbprint != null)
+                {
+                    <div class="form-group">
+                        <label asp-for="CertificateThumbprint"></label>
+                        <input asp-for="CertificateThumbprint" readonly class="form-control" />
+                    </div>
+                }
+            </div>
         </div>
     </div>
 </div>