diff --git a/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java b/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
index af571bad..d308e2e3 100644
--- a/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
+++ b/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
@@ -123,9 +123,9 @@ public class StandardSelfNodeService implements SelfNodeService {
 
         // start RefundService if payments are enabled and this is a SageLauncher
         if (c.paymentsEnabled() && c.isSageLauncher()) {
-            log.info("onStart: starting RefundService");
-            c.getBean(RefundService.class).start();
+            log.info("onStart: starting BillingService and RefundService");
             c.getBean(BillingService.class).start();
+            c.getBean(RefundService.class).start();
         }
 
         return true;
diff --git a/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties
index d5702d3f..0989d73e 100644
--- a/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties
+++ b/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties
@@ -64,15 +64,19 @@ locale_codes=en_US
 locale_en_US=English (US)
 
 # Payment methods
-payment_description_credit=Pay using a Credit Card
-payment_description_code=Use an Invitation Code
-payment_description_free=Enjoy Bubble for FREE!
+payment_description_credit=Credit or Debit Card
+payment_description_code=Invitation Code
+payment_description_free=FREE!
 
-# Payment fields
+# Invite code payment fields
 field_payment_invite_code=Invitation Code
 button_label_submit_invite_code=Use Invite Code
 message_verified_invite_code=Invite Code Successfully Verified
 
+# Credit payment fields
+field_payment_card_number=Credit or Debit Card
+button_label_submit_card_authorization=Authorize Card Payment
+
 # Error messages from API server
 err.accountContactsJson.length=Account contacts length violation
 err.accountPlan.callerCountryDisallowed=Your country is not currently supported by our platform
diff --git a/bubble-web b/bubble-web
index f1432a51..2b02dfe2 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit f1432a512d90c5e3986393da247916f034a8513a
+Subproject commit 2b02dfe20a2c6aec2b85ffe63be9177524b503f7