diff --git a/src/ui/views/Done.svelte b/src/ui/views/Done.svelte
index 0ff1e85c..cbf363d7 100644
--- a/src/ui/views/Done.svelte
+++ b/src/ui/views/Done.svelte
@@ -27,8 +27,13 @@
       </p>
     {/if}
     <p>
-      Development of Ubuntu Touch and this installer is driven by the
-      <a href="https://ubports.com">UBports Community</a>.
+      {#if branding.os === "Ubuntu Touch"}
+         Development of Ubuntu Touch and this installer is driven by the
+         <a href="https://ubports.com">UBports Community</a>.
+      {:else}
+         Development of this installer is driven by the
+         <a href="https://ubports.com">UBports Community</a>.
+      {/if}
       {#if branding["donate-url"]}
         <a href={branding["donate-url"]}>Donate</a> now to allow us to
         continue our mission!
diff --git a/src/ui/views/WaitForDevice.svelte b/src/ui/views/WaitForDevice.svelte
index 4c917c29..cb45aead 100644
--- a/src/ui/views/WaitForDevice.svelte
+++ b/src/ui/views/WaitForDevice.svelte
@@ -45,8 +45,11 @@
     </button>
     <p>
       If your device is not detected automatically, you can select it manually
-      to proceed. Please note that the {branding.appname} will only work on
-      <a href={branding["supported-devices"]}>supported devices</a>.
+      to proceed.
+	    {#if branding["supported-devices"]}
+         Please note that the {branding.appname} will only work on
+         <a href={branding["supported-devices"]}>supported devices</a>.
+	    {/if}
     </p>
     <button
       id="btn-modal-select-device"