diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 5803b20..9719848 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -1,5 +1,4 @@
 class DashboardController < KiqrController
   def show
-    add_breadcrumb "Dashboard", dashboard_path
   end
 end
diff --git a/app/controllers/kiqr/accounts_controller.rb b/app/controllers/kiqr/accounts_controller.rb
index 86e2ede..c3308e9 100644
--- a/app/controllers/kiqr/accounts_controller.rb
+++ b/app/controllers/kiqr/accounts_controller.rb
@@ -19,10 +19,6 @@ def create
       end
     end
 
-    def edit
-      add_breadcrumb "Team settings", edit_account_path(current_account)
-    end
-
     def update
       @account.assign_attributes(account_params)
 
@@ -57,9 +53,7 @@ def form_method
     helper_method :form_method
 
     def setup_breadcrumbs
-      return unless current_account.present?
-
-      add_breadcrumb current_account.name, edit_account_path(current_account)
+      add_breadcrumb "Team settings", edit_account_path(current_account)
     end
   end
 end
diff --git a/app/controllers/kiqr_controller.rb b/app/controllers/kiqr_controller.rb
index 46da975..7b21094 100644
--- a/app/controllers/kiqr_controller.rb
+++ b/app/controllers/kiqr_controller.rb
@@ -1,11 +1,12 @@
 class KiqrController < ApplicationController
-  before_action :setup_dashboard_breadcrumb
+  before_action :setup_root_breadcrumbs
 
   private
 
   # Add the dashboard breadcrumb
-  def setup_dashboard_breadcrumb
+  def setup_root_breadcrumbs
     add_breadcrumb helpers.irelia_icon { "fa fa-home" }, dashboard_path
+    add_breadcrumb current_account.name, dashboard_path if current_account.present?
   end
 
   # Get the options for the locale form select field