diff --git a/web/app/controllers/api_pay_pal_controller.rb b/web/app/controllers/api_pay_pal_controller.rb
index 4b5a19430..5c3526750 100644
--- a/web/app/controllers/api_pay_pal_controller.rb
+++ b/web/app/controllers/api_pay_pal_controller.rb
@@ -11,7 +11,7 @@ class ApiPayPalController < ApiController
 
   def start_checkout
     #cancel_path = params[:path] ? params[:path] : ERB::Util.url_encode('/client#/checkoutPayment')
-    cancel_url = params[:path] ? params[:path] : ERB::Util.url_encode(ApplicationHelper.spa_base_uri(request) + '/checkout')
+    cancel_url = params[:path] ? params[:path] : ERB::Util.url_encode(ApplicationHelper.spa_base_uri + '/checkout')
 
     tax = true
     tax_rate = tax ? 0.0825 : 0
@@ -27,7 +27,8 @@ class ApiPayPalController < ApiController
             :Version => "117.0",
             :SetExpressCheckoutRequestDetails =>
                 {
-                    :ReturnURL => ApplicationHelper.spa_base_uri(request) + '/checkout/paypal/confirm',
+                    #:ReturnURL => ApplicationHelper.spa_base_uri + '/checkout/paypal/confirm',
+                    :ReturnURL => ApplicationHelper.base_uri(request) + '/auth/paypal/checkout',
                     :CancelURL => cancel_url,
                   #  :NoShipping => "1",
                   #  :ReqConfirmShipping => "0",
diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb
index 02e8bc842..1ef1e8d84 100644
--- a/web/app/controllers/api_users_controller.rb
+++ b/web/app/controllers/api_users_controller.rb
@@ -358,7 +358,7 @@ class ApiUsersController < ApiController
   # end
 
   def request_reset_password
-    User.reset_password(current_user.email, ApplicationHelper.spa_base_uri(request))
+    User.reset_password(current_user.email, ApplicationHelper.spa_base_uri)
     respond_with current_user, responder: ApiResponder, :status => 200
   end
 
diff --git a/web/app/controllers/sessions_controller.rb b/web/app/controllers/sessions_controller.rb
index 5430ced19..d3c5460bc 100644
--- a/web/app/controllers/sessions_controller.rb
+++ b/web/app/controllers/sessions_controller.rb
@@ -50,7 +50,8 @@ class SessionsController < ApplicationController
     # on failure, cancel=1
 
     if params[:cancel] == '1' || params[:cancel] == 1
-      redirect_to params[:path] ? params[:path] : ApplicationHelper.spa_base_uri(request) + '/jamtracks'
+      #redirect_to params[:path] ? params[:path] : '/client#/jamtrack'
+      redirect_to params[:path] ? params[:path] : ApplicationHelper.spa_base_uri
       return
     end
 
@@ -86,7 +87,7 @@ class SessionsController < ApplicationController
     end
 
     #redirect_to '/client#/paypal/confirm'
-    redirect_to ApplicationHelper.spa_base_uri(request) + '/checkout/paypal/confirm'
+    redirect_to ApplicationHelper.spa_base_uri + '/checkout/paypal/confirm'
   end
 
 # OAuth docs
diff --git a/web/app/helpers/application_helper.rb b/web/app/helpers/application_helper.rb
index 13e78c93e..ee0897143 100644
--- a/web/app/helpers/application_helper.rb
+++ b/web/app/helpers/application_helper.rb
@@ -27,7 +27,7 @@ module ApplicationHelper
     (request.ssl? ? "https://" : "http://") + request.host_with_port
   end
 
-  def self.spa_base_uri(request)
+  def self.spa_base_uri
     Rails.application.config.spa_origin_url
   end