diff --git a/.env.sample b/.env.sample
index 66edd9f86..9909770d6 100644
--- a/.env.sample
+++ b/.env.sample
@@ -11,7 +11,7 @@ PURCHASE_URL=https://standardnotes.com/purchase
 PLANS_URL=https://standardnotes.com/plans
 DASHBOARD_URL=http://standardnotes.com/dashboard
 
-SF_DEFAULT_SERVER=http://localhost:3000
+DEFAULT_SYNC_SERVER=http://localhost:3000
 
 # Development options
 DEV_DEFAULT_SYNC_SERVER=https://api.standardnotes.com
diff --git a/README.md b/README.md
index 43f863768..f77a05ac2 100644
--- a/README.md
+++ b/README.md
@@ -97,10 +97,10 @@ Then open your browser to `http://localhost:3001`.
 
 ---
 
-You can also set the `SF_DEFAULT_SERVER` environment variable to set the default server for login and registration.
+You can also set the `DEFAULT_SYNC_SERVER` environment variable to set the default server for login and registration.
 
 ```
-SF_DEFAULT_SERVER=https://sync.myserver
+DEFAULT_SYNC_SERVER=https://sync.myserver
 ```
 
 ---
diff --git a/app/assets/javascripts/purchaseFlow/PurchaseFlowWrapper.tsx b/app/assets/javascripts/purchaseFlow/PurchaseFlowWrapper.tsx
index 0105fa209..ecdeb1129 100644
--- a/app/assets/javascripts/purchaseFlow/PurchaseFlowWrapper.tsx
+++ b/app/assets/javascripts/purchaseFlow/PurchaseFlowWrapper.tsx
@@ -12,7 +12,7 @@ export type PurchaseFlowWrapperProps = {
 
 export const getPurchaseFlowUrl = async (application: WebApplication): Promise<string | undefined> => {
   const currentUrl = window.location.href;
-  const successUrl = isDesktopApplication() ? `standardnotes://${currentUrl}` : currentUrl;
+  const successUrl = isDesktopApplication() ? `standardnotes://` : currentUrl;
   if (application.noAccount()) {
     return `${window._purchase_url}/offline?&success_url=${successUrl}`;
   }
diff --git a/app/views/application/app.html.erb b/app/views/application/app.html.erb
index e3b893b77..3cff833d2 100644
--- a/app/views/application/app.html.erb
+++ b/app/views/application/app.html.erb
@@ -31,7 +31,7 @@
     <meta name="og:description" content="Standard Notes is a basic notes app that delivers only the essentials in note taking. Because of its simplicity and resistance to growth, users can count on durability and convenience."/>
 
     <script>
-      window._default_sync_server = "<%= ENV['SF_DEFAULT_SERVER'] %>";
+      window._default_sync_server = "<%= ENV['DEFAULT_SYNC_SERVER'] %>";
       window._bugsnag_api_key = "<%= ENV['BUGSNAG_API_KEY'] %>";
       window._enable_unfinished_features = "<%= ENV['ENABLE_UNFINISHED_FEATURES'] %>" === 'true';
       window._websocket_url = "<%= ENV['WEBSOCKET_URL'] %>";