diff --git a/ui/core/app/templates/scopes/scope/authenticate.hbs b/ui/core/app/templates/scopes/scope/authenticate.hbs
index e2147cab0..5471432d9 100644
--- a/ui/core/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/core/app/templates/scopes/scope/authenticate.hbs
@@ -1 +1,5 @@
-{{outlet}}
\ No newline at end of file
+
+
+ {{outlet}}
+
+
diff --git a/ui/core/app/templates/scopes/scope/authenticate/index.hbs b/ui/core/app/templates/scopes/scope/authenticate/index.hbs
index e2147cab0..e69de29bb 100644
--- a/ui/core/app/templates/scopes/scope/authenticate/index.hbs
+++ b/ui/core/app/templates/scopes/scope/authenticate/index.hbs
@@ -1 +0,0 @@
-{{outlet}}
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/authenticate/method.hbs b/ui/core/app/templates/scopes/scope/authenticate/method.hbs
index 60057d773..c6e4157e2 100644
--- a/ui/core/app/templates/scopes/scope/authenticate/method.hbs
+++ b/ui/core/app/templates/scopes/scope/authenticate/method.hbs
@@ -1,3 +1,29 @@
+{{#if @model}}
+
{{t 'actions.authenticate'}}
+ {{t "auth.descriptions.choose-org"}}
+
+ {{#each @model as |org|}}
+
+ {{org.displayName}}
+
+ {{/each}}
+
+{{/if}}
+
+{{#unless @model}}
+
+
+ {{t "auth.descriptions.no-orgs"}}
+
+
+{{/unless}}
+