diff --git a/src/Signup.js b/src/Signup.js
index 79686b7abf..db69441d6f 100644
--- a/src/Signup.js
+++ b/src/Signup.js
@@ -184,7 +184,13 @@ class Register extends Signup {
         return stage.complete().then(function(request) {
             if (request.auth) {
                 return self._tryRegister(request.auth);
-            }  
+            }
+            else {
+                // never resolve the promise chain. This is for things like email auth
+                // which display a "check your email" message and relies on the
+                // link in the email to actually register you.
+                return q.defer().promise;
+            }
         });
     }
 
diff --git a/src/SignupStages.js b/src/SignupStages.js
index a4d7ac9d17..3521b4ba39 100644
--- a/src/SignupStages.js
+++ b/src/SignupStages.js
@@ -119,7 +119,7 @@ class EmailIdentityStage extends Stage {
                        "&is_url=" +
                        encodeURIComponent(this.signupInstance.getIdentityServerUrl()) +
                        "&session_id=" +
-                       encodeURIComponent(this.signupInstance.getSessionId());
+                       encodeURIComponent(this.signupInstance.params.sessionId);
 
         return this.client.requestEmailToken(
             this.signupInstance.email,