diff --git a/Server/Components/Devices/DeviceCard.razor b/Server/Components/Devices/DeviceCard.razor
index 1c0ec240..bd7e4aeb 100644
--- a/Server/Components/Devices/DeviceCard.razor
+++ b/Server/Components/Devices/DeviceCard.razor
@@ -206,6 +206,13 @@
                         <input class="form-control" readonly value="@Device.PublicIP" />
                     </div>
 
+                    <div class="font-weight-bold text-info mt-2">
+                        MAC Addresses
+                    </div>
+                    <div>
+                        <input class="form-control" readonly value="@(string.Join(", ", Device.MacAddresses))" />
+                    </div>
+
                     <EditForm Model="Device" OnValidSubmit="HandleValidSubmit">
                         <DataAnnotationsValidator />
 
diff --git a/Server/Pages/DeviceDetails.razor b/Server/Pages/DeviceDetails.razor
index fc45dfe3..f0840748 100644
--- a/Server/Pages/DeviceDetails.razor
+++ b/Server/Pages/DeviceDetails.razor
@@ -134,6 +134,22 @@ else
                                 <input type="text" class="form-control" name="agent-memory-total" readonly value="@(Device.TotalMemory)" />
                             </div>
                         </div>
+                        <div class="form-group row">
+                            <label for="agent-memory-total" class="col-sm-2 col-form-label">
+                                Public IP:
+                            </label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control" name="agent-memory-total" readonly value="@(Device.PublicIP)" />
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label for="agent-memory-total" class="col-sm-2 col-form-label">
+                                MAC Addresses:
+                            </label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control" name="agent-memory-total" readonly value="@(string.Join(", ", Device.MacAddresses))" />
+                            </div>
+                        </div>
                         <div class="form-group row">
                             <label for="device-alias" class="col-sm-2 col-form-label">Device Alias:</label>
                             <div class="col-sm-10">
@@ -148,9 +164,9 @@ else
                                     <option value="">None</option>
 
                                     @foreach (var group in DataService.GetDeviceGroups(Username))
-                                        {
+                                    {
                                         <option @key="group.ID" value="@group.ID">@group.Name</option>
-                                        }
+                                    }
                                 </InputSelect>
                                 <ValidationMessage For="() => Device.DeviceGroupID" />
                             </div>