diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee
index 6be3abbc..d2f1c935 100644
--- a/assets/scripts/app/app.coffee
+++ b/assets/scripts/app/app.coffee
@@ -1,7 +1,7 @@
 unless window.TravisApplication
   window.TravisApplication = Em.Application.extend(Ember.Evented,
     LOG_TRANSITIONS: true,
-    authStateBinding: 'auth.state'
+    authState: Ember.computed.alias('auth.state')
     signedIn: (-> @get('authState') == 'signed-in' ).property('authState')
 
     mappings: (->
@@ -58,6 +58,10 @@ unless window.TravisApplication
     signOut: ->
       @get('auth').signOut()
 
+    signingIn: (->
+      Travis.get('authState') == 'signing-in'
+    ).property('authState')
+
     receive: (event, data) ->
       [name, type] = event.split(':')
 
diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee
index 557faef2..d703f922 100644
--- a/assets/scripts/app/controllers.coffee
+++ b/assets/scripts/app/controllers.coffee
@@ -5,6 +5,26 @@ Travis.TopController = Em.Controller.extend
   needs: ['currentUser']
   userBinding: 'controllers.currentUser'
 
+  userName: (->
+    @get('user.name') || @get('user.login')
+  ).property('user.login', 'user.name')
+
+  gravatarUrl: (->
+    "#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm"
+  ).property('user.gravatarId')
+
+  signedIn: (->
+    Travis.get('authState') == 'signed-in'
+  ).property('Travis.authState')
+
+  signedOut: (->
+    Travis.get('authState') == 'signed-out'
+  ).property('Travis.authState')
+
+  signingIn: (->
+    Travis.get('authState') == 'signing-in'
+  ).property('Travis.authState')
+
 Travis.ApplicationController = Em.Controller.extend
   templateName: 'layouts/home'
 
diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index 8c9a8ccc..1d079dda 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -26,6 +26,8 @@ Ember.Route.reopen
 
     error: (error) ->
       if error == 'needs-auth'
+        authController = @container.lookup('controller:auth') || @generateController('auth')
+        authController.set('redirected', true)
         @transitionTo('auth')
       else
         throw(error)
@@ -384,3 +386,6 @@ Travis.AuthRoute = Ember.Route.extend
 
   setupController: ->
     @container.lookup('controller:application').connectLayout('simple')
+
+  deactivate: ->
+    @controllerFor('auth').set('redirected', false)
diff --git a/assets/scripts/app/templates/auth/signin.hbs b/assets/scripts/app/templates/auth/signin.hbs
index 4f2c7a45..01d431a5 100644
--- a/assets/scripts/app/templates/auth/signin.hbs
+++ b/assets/scripts/app/templates/auth/signin.hbs
@@ -1,11 +1,12 @@
-{{#if view.signingIn}}
-  <h1>Signing in ...</h1>
-  <p>
-    Trying to authenticate with GitHub.
-  </p>
-{{else}}
-  <h1>Sign in</h1>
-  <p>
-    <a href="#" {{action "signIn" target="Travis"}}>Please sign in with GitHub.</a>
-  </p>
+{{#if redirected}}
+  <p>You need to sign in to see this page.</p>
 {{/if}}
+<p>
+  <a href="#" {{action "signIn" target="Travis"}}>
+    {{#if Travis.signingIn}}
+      Signing in...
+    {{else}}
+      Sign in with GitHub.
+    {{/if}}
+  </a>
+</p>
diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs
index 5399b8fb..1e32af2b 100644
--- a/assets/scripts/app/templates/layouts/top.hbs
+++ b/assets/scripts/app/templates/layouts/top.hbs
@@ -31,9 +31,15 @@
   </li>
   <li {{bindAttr class="view.classProfile"}}>
     <p class="handle">
-      <a class="signed-out" href="#" {{action "signIn" target="Travis"}}>{{t layouts.top.github_login}}</a>
-      {{#linkTo "profile.index" class="signed-in"}}<img {{bindAttr src="view.gravatarUrl"}}>{{view.userName}}{{/linkTo}}
-      <span class="signing-in">{{t layouts.top.signing_in}}</span>
+      {{#if signedOut}}
+        <a class="signed-out" href="#" {{action "signIn" target="Travis"}}>{{t layouts.top.github_login}}</a>
+      {{/if}}
+      {{#if signedIn}}
+        {{#linkTo "profile.index" class="signed-in"}}<img {{bindAttr src="gravatarUrl"}}/>{{userName}}{{/linkTo}}
+      {{/if}}
+      {{#if signingIn}}
+        <span class="signing-in">{{t layouts.top.signing_in}}</span>
+      {{/if}}
     </p>
     <ul>
       <li>
diff --git a/assets/scripts/app/views/top.coffee b/assets/scripts/app/views/top.coffee
index 3b6befc5..ac9e8d24 100644
--- a/assets/scripts/app/views/top.coffee
+++ b/assets/scripts/app/views/top.coffee
@@ -3,15 +3,6 @@
     templateName: 'layouts/top'
 
     tabBinding: 'controller.tab'
-    userBinding: 'controller.user'
-
-    userName: (->
-      @get('user.name') || @get('user.login')
-    ).property('user.login', 'user.name')
-
-    gravatarUrl: (->
-      "#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm"
-    ).property('user.gravatarId')
 
     # hrm. how to parametrize bindAttr?
     classHome: (->
@@ -25,7 +16,7 @@
     classProfile: (->
       classes = ['profile menu']
       classes.push('active') if @get('tab') == 'profile'
-      classes.push(Travis.get('authState'))
+      classes.push(Travis.get('authState') || 'signed-out')
       classes.join(' ')
     ).property('tab', 'Travis.authState')