diff --git a/dist/stormpath-sdk-angularjs.js b/dist/stormpath-sdk-angularjs.js
index 07d6e48..e723a24 100644
--- a/dist/stormpath-sdk-angularjs.js
+++ b/dist/stormpath-sdk-angularjs.js
@@ -2,7 +2,7 @@
  * stormpath-sdk-angularjs
  * Copyright Stormpath, Inc. 2016
  * 
- * @version v1.1.0-dev-2016-08-17
+ * @version v1.1.0-dev-2016-10-24
  * @link https://github.com/stormpath/stormpath-sdk-angularjs
  * @license Apache-2.0
  */
@@ -3183,14 +3183,9 @@ angular.module('stormpath.userService',['stormpath.CONFIG'])
        * verified and can be used for login.  If rejected the token is expired
        * or has already been used.
        *
-       * @param  {Object} data Data object
+       * @param  {String} sptoken
        *
-       * An object literal for passing the email verification token.
-       * Must follow this format:
-       * ```
-       * {
-       *   sptoken: '<token from email>'
-       * }```
+       * The value of the `sptoken` that was sent by email to the user
        *
        * @description
        *
diff --git a/dist/stormpath-sdk-angularjs.min.js b/dist/stormpath-sdk-angularjs.min.js
index c2dd8e4..227a1ec 100644
--- a/dist/stormpath-sdk-angularjs.min.js
+++ b/dist/stormpath-sdk-angularjs.min.js
@@ -2,7 +2,7 @@
  * stormpath-sdk-angularjs
  * Copyright Stormpath, Inc. 2016
  * 
- * @version v1.1.0-dev-2016-08-17
+ * @version v1.1.0-dev-2016-10-24
  * @link https://github.com/stormpath/stormpath-sdk-angularjs
  * @license Apache-2.0
  */
diff --git a/dist/stormpath-sdk-angularjs.tpls.js b/dist/stormpath-sdk-angularjs.tpls.js
index 36a942e..86be999 100644
--- a/dist/stormpath-sdk-angularjs.tpls.js
+++ b/dist/stormpath-sdk-angularjs.tpls.js
@@ -2,7 +2,7 @@
  * stormpath-sdk-angularjs
  * Copyright Stormpath, Inc. 2016
  * 
- * @version v1.1.0-dev-2016-08-17
+ * @version v1.1.0-dev-2016-10-24
  * @link https://github.com/stormpath/stormpath-sdk-angularjs
  * @license Apache-2.0
  */
diff --git a/dist/stormpath-sdk-angularjs.tpls.min.js b/dist/stormpath-sdk-angularjs.tpls.min.js
index 843bc63..e4c6fbc 100644
--- a/dist/stormpath-sdk-angularjs.tpls.min.js
+++ b/dist/stormpath-sdk-angularjs.tpls.min.js
@@ -2,7 +2,7 @@
  * stormpath-sdk-angularjs
  * Copyright Stormpath, Inc. 2016
  * 
- * @version v1.1.0-dev-2016-08-17
+ * @version v1.1.0-dev-2016-10-24
  * @link https://github.com/stormpath/stormpath-sdk-angularjs
  * @license Apache-2.0
  */
diff --git a/src/spEmailVerification.tpl.html b/src/spEmailVerification.tpl.html
index c7657ff..96da4f5 100644
--- a/src/spEmailVerification.tpl.html
+++ b/src/spEmailVerification.tpl.html
@@ -3,7 +3,7 @@
     <p ng-show="verifying" class="alert alert-warning">We are verifying your account</p>
     <p ng-show="verified" class="alert alert-success">
       Your account has has been verified!
-      <a href="/login">Login Now.</a>
+      <a href="" ng-click="login()">Login Now.</a>
     </p>
     <p ng-show="reVerificationSent" class="alert alert-success">
       We have sent a new verification message to your email address, please check your email for this message.
@@ -25,7 +25,7 @@
       <div class="form-group">
         <label for="spEmail" class="col-xs-12 col-sm-4 control-label">Email or Username</label>
         <div class="col-xs-12 col-sm-4">
-          <input class="form-control" id="spUsername" ng-model="formModel.username" placeholder="Username or Email" ng-disabled="posting">
+          <input class="form-control" id="spEmail" ng-model="formModel.username" placeholder="Username or Email" ng-disabled="posting">
         </div>
       </div>
       <div class="form-group">
diff --git a/src/spLoginForm.tpl.html b/src/spLoginForm.tpl.html
index b8d9b27..8b8a3f9 100644
--- a/src/spLoginForm.tpl.html
+++ b/src/spLoginForm.tpl.html
@@ -49,7 +49,7 @@
         <div class="col-sm-offset-4 col-sm-4">
           <p class="text-danger" ng-show="error" ng-bind="error"></p>
           <button type="submit" class="btn btn-primary" ng-disabled="posting">Login</button>
-          <a href="/forgot" class="pull-right">Forgot Password</a>
+          <a href="" ng-click="forgot()" class="pull-right">Forgot Password</a>
         </div>
       </div>
       <div class="form-group" ng-show="viewModel.accountStores.length">
diff --git a/src/spPasswordResetForm.tpl.html b/src/spPasswordResetForm.tpl.html
index a2343d2..ed07164 100644
--- a/src/spPasswordResetForm.tpl.html
+++ b/src/spPasswordResetForm.tpl.html
@@ -1,10 +1,10 @@
 <div class="row">
   <div class="col-sm-offset-4 col-xs-12 col-sm-4">
     <p ng-show="verifying" class="alert alert-warning text-center">We are verifying this link</p>
-    <p class="alert alert-success" ng-show="reset">Your new password has been set.  Please <a href="/login">Login Now</a>.</p>
+    <p class="alert alert-success" ng-show="reset">Your new password has been set.  Please <a href="" ng-click="login()">Login Now</a>.</p>
     <div ng-show="showVerificationError" class="alert alert-danger">
       This password reset link is not valid.  You may request another
-      link by <a href="/forgot">clicking here</a>.
+      link by <a href="" ng-click="forgot()">clicking here</a>.
     </div>
   </div>
 </div>
@@ -13,15 +13,15 @@
     <form class="form-horizontal" ng-show="verified && !reset" ng-submit="submit()">
 
       <div class="form-group">
-        <label for="spEmail" class="col-xs-12 col-sm-4 control-label">New Password</label>
+        <label for="spNewPassword" class="col-xs-12 col-sm-4 control-label">New Password</label>
         <div class="col-xs-12 col-sm-4">
-          <input class="form-control" id="spUsername" ng-model="formModel.password" placeholder="New Password" type="password" ng-disabled="posting">
+          <input class="form-control" id="spNewPassword" ng-model="formModel.password" placeholder="New Password" type="password" ng-disabled="posting">
         </div>
       </div>
       <div class="form-group">
-        <label for="spEmail" class="col-xs-12 col-sm-4 control-label">Confirm New Password</label>
+        <label for="spConfirmPassword" class="col-xs-12 col-sm-4 control-label">Confirm New Password</label>
         <div class="col-xs-12 col-sm-4">
-          <input class="form-control" id="spUsername" ng-model="formModel.confirmPassword" placeholder="Confirm New Password" type="password" ng-disabled="posting">
+          <input class="form-control" id="spConfirmPassword" ng-model="formModel.confirmPassword" placeholder="Confirm New Password" type="password" ng-disabled="posting">
         </div>
       </div>
       <div class="form-group">
diff --git a/src/spPasswordResetRequestForm.tpl.html b/src/spPasswordResetRequestForm.tpl.html
index 67438c7..3223860 100644
--- a/src/spPasswordResetRequestForm.tpl.html
+++ b/src/spPasswordResetRequestForm.tpl.html
@@ -5,7 +5,7 @@
       Please check your email for this message, then click on the link.
     </p>
     <p ng-show="sent" class="pull-right">
-      <a href="/login">Back to Login</a>
+      <a href="" ng-click="login()">Back to Login</a>
     </p>
     <div ng-show="error" class="alert alert-danger" ng-bind="error"></div>
   </div>
diff --git a/src/spRegistrationForm.tpl.html b/src/spRegistrationForm.tpl.html
index 818e0ac..64846c7 100644
--- a/src/spRegistrationForm.tpl.html
+++ b/src/spRegistrationForm.tpl.html
@@ -37,9 +37,9 @@
   <div class="col-sm-offset-4 col-xs-12 col-sm-4">
     <p class="alert alert-success" ng-show="created && !enabled">Your account has been created.  Please check your email for a verification link.</p>
     <p ng-show="created && !enabled" class="pull-right">
-      <a href="/login">Back to Login</a>
+      <a href="" ng-click="login()">Back to Login</a>
     </p>
-    <p class="alert alert-success" ng-show="created && enabled && !authenticating">Your account has been created.  <a href="/login">Login Now</a>.</p>
+    <p class="alert alert-success" ng-show="created && enabled && !authenticating">Your account has been created.  <a href="" ng-click="login()">Login Now</a>.</p>
   </div>
 </div>
 <div class="row">
@@ -70,4 +70,4 @@
       </div>
     </form>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/stormpath.emailverification.js b/src/stormpath.emailverification.js
index 2ef74b0..85adf0f 100644
--- a/src/stormpath.emailverification.js
+++ b/src/stormpath.emailverification.js
@@ -42,6 +42,9 @@ angular.module('stormpath')
         $scope.posting = false;
       });
   };
+  $scope.login = function(){
+    $location.path('/login')
+  };
 }])
 
 /**
diff --git a/src/stormpath.login.js b/src/stormpath.login.js
index dfe6290..76d7cdc 100644
--- a/src/stormpath.login.js
+++ b/src/stormpath.login.js
@@ -2,7 +2,7 @@
 
 angular.module('stormpath')
 
-.controller('SpLoginFormCtrl', ['$scope','$auth','$viewModel',function ($scope,$auth,$viewModel) {
+.controller('SpLoginFormCtrl', ['$scope','$auth','$location','$viewModel',function ($scope,$auth,$location,$viewModel) {
   $scope.viewModel = null;
 
   $viewModel.getLoginModel().then(function (model) {
@@ -30,6 +30,9 @@ angular.module('stormpath')
         $scope.error = err.message;
       });
   };
+  $scope.forgot = function(){
+    $location.path('/forgot')
+  };
 }])
 
 
diff --git a/src/stormpath.passwordreset.js b/src/stormpath.passwordreset.js
index dbedf6e..b7bff5a 100644
--- a/src/stormpath.passwordreset.js
+++ b/src/stormpath.passwordreset.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('stormpath')
-.controller('SpPasswordResetRequestCtrl', ['$scope','$user',function ($scope,$user) {
+.controller('SpPasswordResetRequestCtrl', ['$scope','$location','$user',function ($scope,$location,$user) {
   $scope.sent = false;
   $scope.posting = false;
   $scope.formModel = {
@@ -21,6 +21,12 @@ angular.module('stormpath')
         $scope.posting = false;
       });
   };
+  $scope.forgot = function(){
+    $location.path('/forgot');
+  };
+  $scope.login = function(){
+    $location.path('/login');
+  };
 }])
 
 .controller('SpPasswordResetCtrl', ['$scope','$location','$user',function ($scope,$location,$user) {
@@ -71,7 +77,9 @@ angular.module('stormpath')
         $scope.posting = false;
       });
   };
-
+  $scope.login = function(){
+    $location.path('/login');
+  };
 }])
 
 /**
diff --git a/src/stormpath.registration.js b/src/stormpath.registration.js
index 636e9dd..0357e14 100644
--- a/src/stormpath.registration.js
+++ b/src/stormpath.registration.js
@@ -61,6 +61,9 @@ angular.module('stormpath')
         $scope.error = err.message;
       });
   };
+  $scope.login = function(){
+    $location.path('/login');
+  };
 }])
 
 
@@ -177,4 +180,4 @@ angular.module('stormpath')
       scope.postLoginState = attrs.postLoginState || '';
     }
   };
-});
\ No newline at end of file
+});