diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 84342e829e6..705acde85f0 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -15,6 +15,23 @@
       display: flex;
       align-items: center;
       height: 100%;
+
+      .header-row {
+        width: 100%;
+
+        .logo-wrapper {
+          float: left;
+        }
+        .auth-buttons {
+          float: right;
+          margin-top: 0.4em;
+
+          .login-button,
+          .signup-button {
+            padding: 8px 14px;
+          }
+        }
+      }
     }
   }
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index dfb1d5e88a8..241871cb5d6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -501,4 +501,10 @@ module ApplicationHelper
     end
     absolute_url
   end
+
+  def can_sign_up?
+    SiteSetting.allow_new_registrations &&
+    !SiteSetting.invite_only &&
+    !SiteSetting.enable_sso
+  end
 end
diff --git a/app/views/application/_header.html.erb b/app/views/application/_header.html.erb
index bd02995d1ad..98440c52ca4 100644
--- a/app/views/application/_header.html.erb
+++ b/app/views/application/_header.html.erb
@@ -2,7 +2,7 @@
   <header class="d-header">
     <div class="wrap">
       <div class="contents">
-        <div class="row">
+        <div class="header-row">
           <div class="logo-wrapper">
             <a href="<%= path "/" %>">
               <%- if application_logo_url.present? %>
@@ -12,6 +12,14 @@
               <%- end %>
             </a>
           </div>
+          <%- unless current_user %>
+            <div class='auth-buttons'>
+              <%- if can_sign_up? %>
+                <a href="<%= path "/signup"%>" class='btn btn-primary btn-small signup-button'><%= I18n.t('sign_up') %></a>
+              <%- end %>
+              <a href="<%= path "/login"%>" class='btn btn-primary btn-small login-button'><%= I18n.t('log_in') %></a>
+            </div>
+          <%- end %>
         </div>
       </div>
     </div>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 52deb73acde..74a2b8ee614 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -64,6 +64,7 @@ en:
   posts: "posts"
   loading: "Loading"
   powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
+  sign_up: "Sign Up"
   log_in: "Log In"
   submit: "Submit"
   purge_reason: "Automatically deleted as abandoned, deactivated account"