diff --git a/server/social.coffee b/server/social.coffee
index a47fe1c..2311827 100644
--- a/server/social.coffee
+++ b/server/social.coffee
@@ -50,6 +50,8 @@ module.exports = exports = (log, loga, argv) ->
       callbackHost = callbackHost + ":" + url.parse(argv.url).port
   else
     callbackHost = url.parse(argv.url).host
+    if argv.oauth2_CallbackPort?
+      callbackHost = callbackHost + ":" + argv.oauth2_CallbackPort
 
   ids = []