diff --git a/assets/images/ui/mustache-spinner.gif b/assets/images/ui/mustache-spinner.gif
new file mode 100644
index 00000000..f5d2a1f1
Binary files /dev/null and b/assets/images/ui/mustache-spinner.gif differ
diff --git a/assets/scripts/app/templates/first_sync.hbs b/assets/scripts/app/templates/first_sync.hbs
index bc3df3f5..f667f82e 100644
--- a/assets/scripts/app/templates/first_sync.hbs
+++ b/assets/scripts/app/templates/first_sync.hbs
@@ -1,5 +1,5 @@
 <div id="getting-started">
-  <h3>Just one more thing...</h3>
+  <h3>Just one more thing...<img class="spinner" width="20" src="/images/ui/mustache-spinner.gif"/></h3>
 
   <p>
     We're almost done getting you on board, just a few more seconds as we talk to GitHub to find out which
@@ -20,11 +20,10 @@
     Now hold tight while we sync the last bits from GitHub, we should be done here any minute now.
   </p>
 
-  {{#if isSyncing}}
-  {{else}}
+  {{#unless isSyncing}}
     <h3>Great news!</h3>
     <p>
       We've successfully synchronized your details from GitHub. We will redirect you to your profile in a few seconds.
     </p>
-  {{/if}}
+  {{/unless}}
 </div>
diff --git a/assets/styles/getting_started.sass b/assets/styles/getting_started.sass
index c804efbc..3b81c21b 100644
--- a/assets/styles/getting_started.sass
+++ b/assets/styles/getting_started.sass
@@ -17,3 +17,10 @@
     padding: 7px 
     float: right
     margin: 15px
+
+    &.spinner
+      border: 0px
+      padding: 0px
+      float: none
+      margin: 0px
+      margin-left: 5px