diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js
index 5cf6e07..42e761d 100644
--- a/app/pods/login/controller.js
+++ b/app/pods/login/controller.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
+  loading: false,
+
   actions: {
     authenticate: function() {
       let credentials = this.getProperties('identification', 'password');
@@ -9,12 +11,12 @@ export default Ember.Controller.extend({
 
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
-      this.transitionToRoute('loading').then(() => {
-        session.authenticate(authenticator, credentials).then(null, (error)=> {
-          this.transitionToRoute('login');
-          this.get('flashMessages').error(error.error);
-        });
-      });
+      this.set('loading', true).then(session.authenticate(authenticator, credentials).catch((error) => {
+        this.transitionToRoute('login');
+        this.set('loading', false);
+        this.get('flashMessages').error(error.error);
+      }));
+      this.set('loading', false);
     }
   }
 });
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs
index c56ca42..7d3f5ac 100644
--- a/app/pods/login/template.hbs
+++ b/app/pods/login/template.hbs
@@ -1,12 +1,16 @@
 {{#x-application invalidateSession="invalidateSession"}}
-  <form {{action "authenticate" on="submit"}}>
-    <h2>Log In</h2>
-      {{input value=identification type="text" placeholder="Email"}}
-      {{input value=password type="password" placeholder="Password"}}
-      {{input class="button-gray" type="submit" value="Log In"}}
-  </form>
-  <br>
-  <div>
-    Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
-  </div>
+  {{#if loading}}
+    {{loading-panel}}
+  {{else}}
+    <form {{action "authenticate" on="submit"}}>
+      <h2>Log In</h2>
+        {{input value=identification type="text" placeholder="Email"}}
+        {{input value=password type="password" placeholder="Password"}}
+        {{input class="button-gray" type="submit" value="Log In"}}
+    </form>
+    <br>
+    <div>
+      Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
+    </div>
+  {{/if}}
 {{/x-application}}