diff --git a/static/css/directives/ui/create-external-notification.css b/static/css/directives/ui/create-external-notification.css
index 133cced84..5c7602a63 100644
--- a/static/css/directives/ui/create-external-notification.css
+++ b/static/css/directives/ui/create-external-notification.css
@@ -66,4 +66,10 @@
 .create-external-notification-element .help-text {
     margin-top: 10px;
     color: #aaa;
-}
\ No newline at end of file
+}
+
+#authorizeEmailModal .loading-container {
+    display: flex;
+    justify-content: center;
+    margin: 20px;
+}
diff --git a/static/directives/create-external-notification.html b/static/directives/create-external-notification.html
index 775838d61..d4ca79fc4 100644
--- a/static/directives/create-external-notification.html
+++ b/static/directives/create-external-notification.html
@@ -191,43 +191,47 @@
       </button>
     </div>
   </form>
+</div>
 
-  <!-- Authorize email dialog -->
-  <div class="modal" tabindex="-1" role="dialog" id="authorizeEmailModal">
-    <div class="modal-dialog">
+<!-- Authorize email dialog -->
+<div class="modal" tabindex="-1" role="dialog" id="authorizeEmailModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
       <div class="modal-header">
+        <button type="button" class="close" ng-click="cancelEmailAuth()">
+          &times;
+        </button>
         <h4 class="modal-title">E-mail authorization</h4>
       </div>
-      <div class="modal-content">
-        <div class="modal-body" style="padding: 4px; padding-left: 20px;">
-          <button type="button" class="close" ng-click="cancelEmailAuth()" style="padding: 4px;">
-            &times;
-          </button>
 
-          <!-- Authorize e-mail view -->
-          <div ng-show="status == 'authorizing-email-sent'">
-            An e-mail has been sent to <code>{{ currentConfig.email }}</code>. Please click the link contained
-            in the e-mail.
-            <br><br>
-            <span class="cor-loader-inline"></span>
-          </div>
-
-          <!-- Authorize e-mail view -->
-          <div ng-show="status == 'unauthorized-email'">
-            The e-mail address <code>{{ currentConfig.email }}</code> has not been authorized to receive
-            notifications from this repository. Please click "Send Authorization E-mail" below to start
-            the authorization process.
-          </div>
+      <div class="modal-body" style="padding: 4px; padding-left: 20px;">
+        <!-- Authorize e-mail view -->
+        <div ng-if="status == 'authorizing-email-sent'">
+          An e-mail has been sent to <code>{{ ::currentConfig.email }}</code>. Please click the link contained
+          in the e-mail.
         </div>
 
-        <!-- Auth e-mail button bar -->
-        <div class="modal-footer" ng-if="status == 'unauthorized-email'">
-          <button type="button" class="btn btn-success" ng-click="sendAuthEmail()">
-            Send Authorization E-mail
-          </button>
-          <button type="button" class="btn btn-default" ng-click="cancelEmailAuth()" ng-disabled="creating">Cancel</button>
+        <!-- Authorize e-mail view -->
+        <div ng-if="status == 'unauthorized-email'">
+          The e-mail address <code>{{ ::currentConfig.email }}</code> has not been authorized to receive
+          notifications from this repository. Please click "Send Authorization E-mail" below to start
+          the authorization process.
         </div>
       </div>
+
+      <!-- Auth e-mail button bar -->
+      <div class="modal-footer" ng-if="status == 'unauthorized-email'">
+        <button type="button" class="btn btn-success" ng-click="sendAuthEmail()">
+          Send Authorization E-mail
+        </button>
+        <button type="button" class="btn btn-default" ng-click="cancelEmailAuth()" ng-disabled="creating">Cancel</button>
+      </div>
+
+      <!-- Loading -->
+      <div ng-if="status != 'unauthorized-email'"
+           class="loading-container">
+        <span class="cor-loader-inline"></span>
+      </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>