From 916519a43a528cd6cbab5e1d0437572359c5e49b Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 29 Mar 2017 20:58:27 -0400
Subject: [PATCH] org name from mail invite link

---
 .../accountsOrganizationAcceptController.js    |  3 ++-
 .../views/accountsOrganizationAccept.html      | 18 +++++++-----------
 src/app/config.js                              |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/app/accounts/accountsOrganizationAcceptController.js b/src/app/accounts/accountsOrganizationAcceptController.js
index 806d85a6..31805688 100644
--- a/src/app/accounts/accountsOrganizationAcceptController.js
+++ b/src/app/accounts/accountsOrganizationAcceptController.js
@@ -7,7 +7,8 @@ angular
             params: $state.params
         };
 
-        if (!$state.params.organizationId || !$state.params.organizationUserId || !$state.params.token || !$state.params.email) {
+        if (!$state.params.organizationId || !$state.params.organizationUserId || !$state.params.token ||
+            !$state.params.email || !$state.params.organizationName) {
             $state.go('frontend.login.info').then(function () {
                 toastr.error('Invalid parameters.');
             });
diff --git a/src/app/accounts/views/accountsOrganizationAccept.html b/src/app/accounts/views/accountsOrganizationAccept.html
index 3078d2c8..ae151ddf 100644
--- a/src/app/accounts/views/accountsOrganizationAccept.html
+++ b/src/app/accounts/views/accountsOrganizationAccept.html
@@ -10,25 +10,21 @@
             Accepting invitation...
         </div>
         <div ng-show="!loading && !accepting">
-            <p class="login-box-msg">Join Organization</p>
+            <p class="login-box-msg">Join {{state.params.organizationName}}</p>
             <p class="text-center"><strong>{{state.params.email}}</strong></p>
             <p>
-                You've been invited to join the an organization. To accept the invitation, you need to log in or
-                create a new bitwarden account.
+                You've been invited to join the organization listed above.
+                To accept the invitation, you need to log in or create a new bitwarden account.
             </p>
             <hr />
             <div class="row">
                 <div class="col-sm-6">
-                    <p>
-                        <a ui-sref="frontend.login.info({returnState: state, email: state.params.email})"
-                           class="btn btn-primary btn-block btn-flat">Log In</a>
-                    </p>
+                    <a ui-sref="frontend.login.info({returnState: state, email: state.params.email})"
+                       class="btn btn-primary btn-block btn-flat">Log In</a>
                 </div>
                 <div class="col-sm-6">
-                    <p>
-                        <a ui-sref="frontend.register({returnState: state, email: state.params.email})"
-                           class="btn btn-primary btn-block btn-flat">Create Account</a>
-                    </p>
+                    <a ui-sref="frontend.register({returnState: state, email: state.params.email})"
+                       class="btn btn-primary btn-block btn-flat">Create Account</a>
                 </div>
             </div>
         </div>
diff --git a/src/app/config.js b/src/app/config.js
index 4d09508d..aa1511e2 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -211,7 +211,7 @@ angular
                 }
             })
             .state('frontend.organizationAccept', {
-                url: '^/accept-organization?organizationId&organizationUserId&token&email',
+                url: '^/accept-organization?organizationId&organizationUserId&token&email&organizationName',
                 templateUrl: 'app/accounts/views/accountsOrganizationAccept.html',
                 controller: 'accountsOrganizationAcceptController',
                 data: {