diff --git a/app/components/endpoints/endpoints.html b/app/components/endpoints/endpoints.html
index fd6660b66..2421d4261 100644
--- a/app/components/endpoints/endpoints.html
+++ b/app/components/endpoints/endpoints.html
@@ -14,7 +14,10 @@
       <rd-widget-header icon="fa-exclamation-triangle" title="Endpoint management is not available">
       </rd-widget-header>
       <rd-widget-body>
-        <span class="small text-muted">Portainer has been started using the <code>--external-endpoints</code> flag. Endpoint management via the UI is disabled. You can still manage endpoint access.</span>
+        <span class="small text-muted">Portainer has been started using the <code>--external-endpoints</code> flag.
+          Endpoint management via the UI is disabled.
+          <span ng-if="applicationState.application.authentication">You can still manage endpoint access.</span>
+        </span>
       </rd-wigdet-body>
     </rd-widget>
   </div>
diff --git a/app/components/registries/registries.html b/app/components/registries/registries.html
index cf5772dcc..17ba58425 100644
--- a/app/components/registries/registries.html
+++ b/app/components/registries/registries.html
@@ -133,10 +133,10 @@
                 </td>
               </tr>
               <tr ng-if="!registries">
-                <td colspan="3" class="text-center text-muted">Loading...</td>
+                <td colspan="4" class="text-center text-muted">Loading...</td>
               </tr>
               <tr ng-if="registries.length == 0">
-                <td colspan="3" class="text-center text-muted">No registries available.</td>
+                <td colspan="4" class="text-center text-muted">No registries available.</td>
               </tr>
             </tbody>
           </table>