diff --git a/client/views/enrollAccount/enrollAccount.html b/client/views/enrollAccount/enrollAccount.html
index f7075583..c7e262d9 100644
--- a/client/views/enrollAccount/enrollAccount.html
+++ b/client/views/enrollAccount/enrollAccount.html
@@ -1,6 +1,6 @@
 <template name='entryEnrollAccount'>
-  <div class="container">
-    <div class="row">
+  <div class="{{containerCSSClass}}">
+    <div class="{{rowCSSClass}}">
       {{#if logo}}
         <div class="entry-logo">
             <a href="/"><img src="{{logo}}" alt="logo"></a>
@@ -18,7 +18,10 @@ <h3>{{t9n "choosePassword"}}</h3>
           <button type="submit" class="btn btn-default">{{t9n "setPassword"}}</button>
         </form>
         {{#if showSignupCode}}
-          <p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="/sign-up">{{t9n 'signUp'}}</a></p>
+          <p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="{{pathFor 'entrySignUp'}}">{{t9n 'signUp'}}</a></p>
+        {{/if}}
+        {{#if talkingToServer}}
+          {{> spinner}}
         {{/if}}
       </div>
     </div>
diff --git a/shared/router.coffee b/shared/router.coffee
index 478a6b9c..6ea74e3a 100644
--- a/shared/router.coffee
+++ b/shared/router.coffee
@@ -93,6 +93,7 @@ Router.map ->
     onBeforeAction: ->
       Session.set('entryError', undefined)
       Session.set('resetToken', @params.resetToken)
+      @next()
 
 # Get all the accounts-entry routes one time
 exclusions = []
diff --git a/versions.json b/versions.json
index 354bf255..bb4f3d6c 100644
--- a/versions.json
+++ b/versions.json
@@ -156,10 +156,6 @@
       "mongo",
       "1.0.8"
     ],
-    [
-      "mrt:underscore-string-latest",
-      "2.3.3"
-    ],
     [
       "npm-bcrypt",
       "0.7.7"