diff --git a/static/js/controllers.js b/static/js/controllers.js
index c0424d444..89cc71309 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -1434,7 +1434,7 @@ function OrgViewCtrl($rootScope, $scope, ApiService, $routeParams) {
   loadOrganization();
 }
 
-function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService, PlanService, ApiService) {
+function OrgAdminCtrl($rootScope, $scope, $timeout, Restangular, $routeParams, UserService, PlanService, ApiService) {
   var orgname = $routeParams.orgname;
 
   // Load the list of plans.
@@ -1481,7 +1481,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
       $scope.changingOrganization = false;
       $scope.changeEmailForm.$setPristine();
       $scope.organization = org;
-    }, function(resp) {
+    }, function(result) {
       $scope.changingOrganization = false;
       $scope.changeEmailError = result.data.message;
       $timeout(function() {
diff --git a/static/partials/org-admin.html b/static/partials/org-admin.html
index 927caae26..7a7a6426e 100644
--- a/static/partials/org-admin.html
+++ b/static/partials/org-admin.html
@@ -32,7 +32,7 @@
             <div class="panel-title">Organization's e-mail address</div>
             <div class="panel-content" style="padding-left: 20px; margin-top: 10px;">
               <form class="form-change" id="changeEmailForm" name="changeEmailForm" ng-submit="changeEmail()" data-trigger="manual"
-                      data-content="{{ changeEmailError }}" data-placement="right" ng-show="!updatingOrganization">
+                      data-content="{{ changeEmailError }}" data-placement="bottom" ng-show="!updatingOrganization">
                 <img src="//www.gravatar.com/avatar/{{ organizationEmail | gravatar }}?s=24&amp;d=identicon">
                 <input type="email" class="form-control" ng-model="organizationEmail"
                        style="margin-left: 10px; margin-right: 10px; width: 400px; display: inline-block;" required>