diff --git a/static/directives/tour-content.html b/static/directives/tour-content.html
index a88b61258..5f48ce64a 100644
--- a/static/directives/tour-content.html
+++ b/static/directives/tour-content.html
@@ -71,16 +71,11 @@
   </div>
 
   <div class="tour-action">
-    <a href="/plans" ng-show="!user.anonymous">
+    <a href="/plans?trial-plan=personal">
       <button class="btn btn-success">
         Start free trial
       </button>
     </a>
-    <a href="/signin" ng-show="user.anonymous">
-      <button class="btn btn-primary">
-        Create account now
-      </button>
-    </a>
   </div>
 </div>
 
diff --git a/static/js/controllers.js b/static/js/controllers.js
index e989e4843..a39bcf7d5 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -24,12 +24,7 @@ function SecurityCtrl($scope) {
 function ContactCtrl($scope) {
 }
 
-function PlansCtrl($scope, $location, UserService, PlanService) {
-  // Load the list of plans.
-  PlanService.getPlans(function(plans) {
-    $scope.plans = plans;
-  }, /* include the personal plan */ true);
-
+function PlansCtrl($scope, $location, UserService, PlanService, $routeParams) {
   // Monitor any user changes and place the current user into the scope.
   UserService.updateUserIn($scope);
 
@@ -46,6 +41,15 @@ function PlansCtrl($scope, $location, UserService, PlanService) {
       $('#signinModal').modal({});
     }
   };
+
+  // Load the list of plans.
+  PlanService.getPlans(function(plans) {
+    $scope.plans = plans;
+
+    if ($scope && $routeParams['trial-plan']) {
+      $scope.buyNow($routeParams['trial-plan']);
+    }    
+  }, /* include the personal plan */ true);
 }
 
 function TutorialCtrl($scope, AngularTour, AngularTourSignals, UserService, Config) {
diff --git a/test/data/test.db b/test/data/test.db
index 3ea2e8dfa..a3597b09d 100644
Binary files a/test/data/test.db and b/test/data/test.db differ