diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
index 95f4dd94f..1db46379e 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
@@ -457,8 +457,6 @@ const isCommaSeparatedURLs = input =>
 </script>
 
 <form id="UnraidNetSettings" markdown="1" name="UnraidNetSettings" method="POST" action="/update.htm" target="progressFrame">
-<div markdown="1" class="<?=$shade?>"><!-- begin Account section -->
-
 <?
 /**
  * Allowed origins warning displayed when the current webGUI URL is NOT included in the known lists of allowed origins.
@@ -480,6 +478,7 @@ if (stripos($allowedOrigins.",", "/".$host.",") === false) {
 }
 ?>
 <? if ($allowedOriginsArr): ?>
+<div markdown="1" class="<?=$shade?>"><!-- begin allowedOrigins warning -->
 <dl>
   <div style="margin-bottom: 2rem;">
     <span class="orange-text"><i class='fa fa-warning fa-fw'></i> <strong>_(Warning)_</strong></span> <?= sprintf(_('Your current url **%s** is not in the list of allowed origins for this server'), $host) ?>.
@@ -493,25 +492,8 @@ if (stripos($allowedOrigins.",", "/".$host.",") === false) {
     <dd>
   </div>
 </dl>
-<? endif ?>
-
-&nbsp;
-: <span>_(Questions? See <a href="https://docs.unraid.net/category/unraid-connect" target="_blank">the documentation</a>.)_</span>
-
-
-_(Account status)_:
-: <connect-auth></connect-auth>
-
-<?if($isRegistered):?>
-_(Connected to Unraid Connect Cloud)_: 
-<?if($isConnected):?>
-: _(Yes)_
-<?else:?>
-: <i class="fa fa-warning icon warning"></i> _(No)_
-<?endif // end check for ($isConnected) ?>
-<?endif // end check for ($isRegistered) ?>
-
 </div><!-- end Account section -->
+<? endif ?>
 
 <div markdown="1" class="<?=$shade?>"><!-- begin Remote Access section -->
 
@@ -705,8 +687,22 @@ $(function() {
 
 <!-- start unraid-api section -->
 <div markdown="1" class="js-unraidApiLogs <?=$shade?>">
+&nbsp;
+: <span>_(Questions? See <a href="https://docs.unraid.net/category/unraid-connect" target="_blank">the documentation</a>.)_</span>
+
+_(Account status)_:
+: <connect-auth></connect-auth>
+
+<?if($isRegistered):?>
+_(Connected to Unraid Connect Cloud)_: 
+<?if($isConnected):?>
+: _(Yes)_
+<?else:?>
+: <i class="fa fa-warning icon warning"></i> _(No)_
+<?endif // end check for ($isConnected) ?>
+<?endif // end check for ($isRegistered) ?>
+
 _(Download unraid-api Logs)_:
 : <connect-download-api-logs></connect-download-api-logs>
 </div>
 <!-- end unraid-api section -->
-