diff --git a/lib/cannery/accounts.ex b/lib/cannery/accounts.ex
index 688097d0..b1858749 100644
--- a/lib/cannery/accounts.ex
+++ b/lib/cannery/accounts.ex
@@ -238,6 +238,14 @@ defmodule Cannery.Accounts do
     :ok
   end
 
+  @doc """
+  Returns a boolean if registration is allowed or not
+  """
+  def allow_registration?() do
+    Application.get_env(:cannery, CanneryWeb.Endpoint)[:registration] == "public" or
+      list_users_by_role(:admin) |> Enum.empty?()
+  end
+
   ## Confirmation
 
   @doc """
diff --git a/lib/cannery_web/live/component/topbar.html.leex b/lib/cannery_web/live/component/topbar.html.leex
index bbf61e9e..fd6d9d09 100644
--- a/lib/cannery_web/live/component/topbar.html.leex
+++ b/lib/cannery_web/live/component/topbar.html.leex
@@ -48,24 +48,31 @@
             <%= link @current_user.email, class: "hover:underline",
               to: Routes.user_settings_path(CanneryWeb.Endpoint, :edit) %>
           </li>
+
           <li>
-            <%= link to: Routes.user_session_path(CanneryWeb.Endpoint, :delete), method: :delete do %>
+            <%= link to: Routes.user_session_path(CanneryWeb.Endpoint, :delete), method: :delete,
+              data: [confirm: "Are you sure you want to log out?"] do %>
               <i class="fas fa-sign-out-alt"></i>
             <% end %>
           </li>
 
-          <%= if function_exported?(Routes, :live_dashboard_path, 2) do %>
+          <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
             <li>
               <%= link to: Routes.live_dashboard_path(CanneryWeb.Endpoint, :home) do %>
                 <i class="fas fa-tachometer-alt"></i>
               <% end %>
             </li>
           <% end %>
+
         <% else %>
+
+          <%= if Accounts.allow_registration?() do %>
           <li>
             <%= link "Register", class: "hover:underline",
               to: Routes.user_registration_path(CanneryWeb.Endpoint, :new) %>
           </li>
+          <% end %>
+
           <li>
             <%= link "Log in", class: "hover:underline",
               to: Routes.user_session_path(CanneryWeb.Endpoint, :new) %>
diff --git a/lib/cannery_web/templates/layout/topbar.html.eex b/lib/cannery_web/templates/layout/topbar.html.eex
index 6d327119..884a7715 100644
--- a/lib/cannery_web/templates/layout/topbar.html.eex
+++ b/lib/cannery_web/templates/layout/topbar.html.eex
@@ -13,15 +13,19 @@
             to: Routes.user_settings_path(CanneryWeb.Endpoint, :edit) %>
         </li>
         <li>
-          <%= link to: Routes.user_session_path(CanneryWeb.Endpoint, :delete), method: :delete do %>
+          <%= link to: Routes.user_session_path(CanneryWeb.Endpoint, :delete), method: :delete,
+            data: [confirm: "Are you sure you want to log out?"] do %>
             <i class="fas fa-sign-out-alt"></i>
           <% end %>
         </li>
       <% else %>
+        <%= if Accounts.allow_registration?() do %>
         <li>
           <%= link "Register", class: "hover:underline",
             to: Routes.user_registration_path(CanneryWeb.Endpoint, :new) %>
         </li>
+        <% end %>
+
         <li>
           <%= link "Log in", class: "hover:underline",
             to: Routes.user_session_path(CanneryWeb.Endpoint, :new) %>
@@ -29,4 +33,4 @@
       <% end %>
     </ul>
   </div>
-</nav>
\ No newline at end of file
+</nav>