diff --git a/app/src/com/android/rkpdapp/provisioner/WidevineProvisioner.java b/app/src/com/android/rkpdapp/provisioner/WidevineProvisioner.java
index 8ed9321..6208e2b 100644
--- a/app/src/com/android/rkpdapp/provisioner/WidevineProvisioner.java
+++ b/app/src/com/android/rkpdapp/provisioner/WidevineProvisioner.java
@@ -56,7 +56,7 @@ public class WidevineProvisioner extends Worker {
     private static final Map<String, String> REQ_PROPERTIES = new HashMap<>();
     static {
         REQ_PROPERTIES.put("Accept", "*/*");
-        REQ_PROPERTIES.put("User-Agent", buildUserAgentString());
+        REQ_PROPERTIES.put("User-Agent", "AndroidRemoteProvisioner");
         REQ_PROPERTIES.put("Content-Type", "application/json");
         REQ_PROPERTIES.put("Connection", "close");
     }
@@ -67,17 +67,6 @@ public WidevineProvisioner(@NonNull Context context, @NonNull WorkerParameters p
         super(context, params);
     }
 
-    private static String buildUserAgentString() {
-        ArrayList<String> parts = new ArrayList<>();
-        parts.add("AndroidRemoteProvisioner");
-        parts.add(Build.BRAND);
-        parts.add(Build.MODEL);
-        parts.add(Build.TYPE);
-        parts.add(Build.VERSION.INCREMENTAL);
-        parts.add(Build.ID);
-        return String.join("/", parts);
-    }
-
     private Result retryOrFail() {
         if (getRunAttemptCount() < MAX_RETRIES) {
             return Result.retry();
diff --git a/app/src/com/android/rkpdapp/utils/Settings.java b/app/src/com/android/rkpdapp/utils/Settings.java
index c421909..60f16d8 100644
--- a/app/src/com/android/rkpdapp/utils/Settings.java
+++ b/app/src/com/android/rkpdapp/utils/Settings.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.ext.settings.RemoteKeyProvisioningSettings;
 import android.os.SystemProperties;
 import android.util.Log;
 
@@ -223,6 +224,11 @@ public static Instant getExpirationTime(Context context) {
      * servers.
      */
     public static String getUrl(Context context) {
+        String override = RemoteKeyProvisioningSettings.getServerUrlOverride(context);
+        if (override != null) {
+            return override;
+        }
+
         SharedPreferences sharedPref = getSharedPreferences(context);
         return sharedPref.getString(KEY_URL, getDefaultUrl());
     }