diff --git a/lib/modules/openid.js b/lib/modules/openid.js
index 4ceb5eab..6cacd13e 100644
--- a/lib/modules/openid.js
+++ b/lib/modules/openid.js
@@ -46,6 +46,7 @@ everyModule.submodule('openid')
       .promises(null)
   .sendToAuthenticationUri(function(req,res) {
     var that = this;
+    var p = this.Promise();
 
     // Automatic hostname detection + assignment
     if (!this._myHostname || this._alwaysDetectHostname) {
@@ -56,6 +57,9 @@ everyModule.submodule('openid')
       if(err) return p.fail(err);
       that.redirect(res, authenticationUrl);
     });
+
+    p.fulfill();
+    return p;
   })
   .getSession( function(req) {
     return req.session;