diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index efe797f24..e48cd1fb7 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -404,9 +404,13 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(valid.SendJsonError());
             }
 
-            //Lookup identifier
-            var server = PlexApi.GetServer(plexSettings.PlexAuthToken);
-            plexSettings.MachineIdentifier = server.Server.FirstOrDefault(x => x.AccessToken == plexSettings.PlexAuthToken)?.MachineIdentifier;
+            if (string.IsNullOrEmpty(plexSettings.MachineIdentifier))
+            {
+                //Lookup identifier
+                var server = PlexApi.GetServer(plexSettings.PlexAuthToken);
+                plexSettings.MachineIdentifier =
+                    server.Server.FirstOrDefault(x => x.AccessToken == plexSettings.PlexAuthToken)?.MachineIdentifier;
+            }
 
             var result = await PlexService.SaveSettingsAsync(plexSettings);
 
diff --git a/PlexRequests.UI/Views/Admin/Plex.cshtml b/PlexRequests.UI/Views/Admin/Plex.cshtml
index 67700e59f..c2ce7be25 100644
--- a/PlexRequests.UI/Views/Admin/Plex.cshtml
+++ b/PlexRequests.UI/Views/Admin/Plex.cshtml
@@ -87,21 +87,6 @@
                     <input type="text" class="form-control form-control-custom " id="SubDir" name="SubDir" value="@Model.SubDir">
                 </div>
             </div>
-            
-            @*<div class="form-group">
-                <label for="PlexDatabaseLocationOverride" class="control-label">Plex Database Override</label>
-                <div>
-                    <input type="text" class="form-control form-control-custom " id="PlexDatabaseLocationOverride" name="PlexDatabaseLocationOverride" placeholder="%LOCALAPPDATA%\Plex Media Server\" value="@Model.PlexDatabaseLocationOverride">
-                </div>
-                <small>
-                    This is your Plex data directory location, if we cannot manually find it then you need to specify the location! See <a href="https://support.plex.tv/hc/en-us/articles/202915258-Where-is-the-Plex-Media-Server-data-directory-located-">Here</a>.
-                </small>
-            </div>
-            <div class="form-group">
-                <div class="">
-                    <button id="dbTest" class="btn btn-primary-outline">Test Database Directory <i class="fa fa-database"></i> <div id="dbSpinner"></div></button>
-                </div>
-            </div>*@
 
             <div class="form-group">
                 <label for="authToken" class="control-label">Plex Authorization Token</label>
@@ -110,6 +95,13 @@
                 </div>
             </div>
             
+            <div class="form-group">
+                <label for="MachineIdentifier" class="control-label">Machine Identifier</label>
+                <div class="">
+                    <input type="text" class="form-control-custom form-control" id="MachineIdentifier" name="MachineIdentifier" value="@Model.MachineIdentifier">
+                </div>
+            </div>
+          
 
 
             <div class="form-group">