diff --git a/lib/login/addon/components/login-user-pass/component.js b/lib/login/addon/components/login-user-pass/component.js
index 7684562a2..29de7b02b 100644
--- a/lib/login/addon/components/login-user-pass/component.js
+++ b/lib/login/addon/components/login-user-pass/component.js
@@ -18,6 +18,7 @@ export default Component.extend({
   shown: false,
   provider: null,
   readableProvider: null,
+  onlyLocal: null,
 
   actions: {
     showLocal() {
@@ -70,7 +71,7 @@ export default Component.extend({
       set(this, 'rememberUsername', true);
     }
 
-    if (get(this, 'provider')) {
+    if (get(this, 'provider') && !get(this,'onlyLocal')) {
       let pv = null;
       switch(get(this, 'provider')) {
       case 'activedirectory':
@@ -78,7 +79,7 @@ export default Component.extend({
         break;
       case 'local':
       default:
-        pv = 'Local Auth';
+        pv = 'a Local User';
         break;
       }
 
diff --git a/lib/login/addon/components/login-user-pass/template.hbs b/lib/login/addon/components/login-user-pass/template.hbs
index af48138c3..da9747587 100644
--- a/lib/login/addon/components/login-user-pass/template.hbs
+++ b/lib/login/addon/components/login-user-pass/template.hbs
@@ -27,8 +27,10 @@
       <button disabled={{waiting}} class="btn bg-primary" {{action "authenticate"}}>
         {{#if waiting}}
           <i class="icon icon-spinner icon-spin"></i> {{t 'loginUserPass.loggingInLabel'}}
-        {{else}}
+        {{else if readableProvider}}
           {{t 'loginUserPass.loginLabel' provider=readableProvider}}
+        {{else}}
+          {{t 'loginUserPass.genericLoginLabel'}}
         {{/if}}
       </button>
     </p>
diff --git a/lib/login/addon/login/template.hbs b/lib/login/addon/login/template.hbs
index 3d5fe578d..dd6d8f031 100644
--- a/lib/login/addon/login/template.hbs
+++ b/lib/login/addon/login/template.hbs
@@ -40,6 +40,7 @@
             action="authenticate"
             waiting=waiting
             shown=onlyLocal
+            onlyLocal=onlyLocal
             provider="local"
         }}
       {{/if}}
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 871486e46..e7bc8e241 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -3881,6 +3881,7 @@ loginUserPass:
   caasLabel: Email
   remember: Remember
   userPlaceholder: e.g. jsmith
+  genericLoginLabel: Log In
   loginLabel: Log In  with {provider}
   loggingInLabel: Logging In...
   passwordLabel: Password