diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cf69b955d..8f043f6ee 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -38,7 +38,14 @@
             logotype: 'GOV.UK',
             service_name: 'Share Lettings and Sales for Social Housing in England Data with DLUHC',
             service_url: '/'
-          )
+          ) do |component|
+            if current_user.nil?
+               component.navigation_item(text: 'Case logs', href: '/case_logs')
+            elsif 
+              component.navigation_item(text: 'Your account', href: '/users/account')
+              component.navigation_item(text: 'Sign out', href: destroy_user_session_path, options: {:method => :delete})
+            end
+          end
       %>
     </header>
     <aside class="govuk-width-container">
diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb
index bc23ffc73..8aa6e25c4 100644
--- a/spec/features/user_spec.rb
+++ b/spec/features/user_spec.rb
@@ -58,8 +58,23 @@ RSpec.describe "User Features" do
     end
   end
 
-  context "If a not logged in user tries to access pages that need permissions" do
-    it "redirects to log in page" do
+  context "If user not logged in" do
+    it "'Your account' link does not display" do
+      visit("/case_logs")
+      expect(page).to have_no_link("Your account")
+    end
+
+    it "Can navigate and sign in page with sign in button" do
+      visit("/")
+      expect(page).to have_link("Case logs")
+      click_link("Case logs")
+      fill_in("user_email", with: user.email)
+      fill_in("user_password", with: "pAssword1")
+      click_button("Sign in")
+      expect(page).to have_current_path("/case_logs")
+    end
+
+    it "tries to access account page, redirects to log in page" do
       visit("/users/account")
       expect(page).to have_content("Sign in to your account to submit CORE data")
     end
@@ -73,6 +88,13 @@ RSpec.describe "User Features" do
       click_button("Sign in")
     end
 
+    it "shows 'Your account' link in navigation if logged in and redirect to correct page" do
+      visit("/case_logs")
+      expect(page).to have_link("Your account")
+      click_link("Your account")
+      expect(page).to have_current_path("/users/account")
+    end
+
     it "main page is present and accessible" do
       visit("/users/account")
       expect(page).to have_content("Your account")