diff --git a/package.json b/package.json
index 43f142ba..659d2bec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tmac-website",
   "description": "Website for the Texas Music Administrators Conference",
-  "version": "2.30.2",
+  "version": "2.30.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/m2mathew/tmac-website"
diff --git a/src/components/members/MemberContent/MemberInfo/MemberStatus.tsx b/src/components/members/MemberContent/MemberInfo/MemberStatus.tsx
index 2ff4aa53..884ecc41 100644
--- a/src/components/members/MemberContent/MemberInfo/MemberStatus.tsx
+++ b/src/components/members/MemberContent/MemberInfo/MemberStatus.tsx
@@ -27,9 +27,11 @@ import MemberInfoCard from '../../../shared/MemberInfoCard';
 import PaypalButtonWrapper from '../../../register/paypal/paypal-button-wrapper';
 import PrintInvoiceUI from '../../../../pages/members/PrintInvoiceUI';
 import { appNameShort } from '../../../../utils/app-constants';
+import { TfaaAuthUser } from '../../../layout';
 
 // Local Typings
 interface Props {
+  currentAuthUser: TfaaAuthUser | null;
   currentMemberData: TfaaMemberData | null;
 }
 
@@ -103,7 +105,10 @@ const StyledStrong = styled.strong(({ theme }) => ({
 }));
 
 // Component Definition
-const MemberStatus: React.FC<Props> = ({ currentMemberData }) => {
+const MemberStatus: React.FC<Props> = ({
+  currentAuthUser,
+  currentMemberData,
+}) => {
   const isRegisteredForCurrentYear = Boolean(currentMemberData);
 
   // If the member paid by check, the TFAA Executive Secretary will manually
@@ -128,6 +133,8 @@ const MemberStatus: React.FC<Props> = ({ currentMemberData }) => {
       receiptId: currentMemberData?.receiptId ?? 0,
     };
 
+    const userId = `${currentAuthUser?.email}-${currentAuthUser?.uid}`;
+
     // Update the member's payment data in the Firestore database
     // This shape should be the same as register-membmer-payment
     //  in the handleCompleteMemberPaymentStep function
@@ -135,7 +142,7 @@ const MemberStatus: React.FC<Props> = ({ currentMemberData }) => {
       await doUpdateEntry(
         updatedMemberData,
         FIRESTORE_MEMBER_COLLECTION,
-        currentMemberData?.userId,
+        userId,
       );
     } catch (error) {
       console.error('Error while updating after a successful payment', error);
diff --git a/src/components/members/MemberContent/MemberInfo/index.tsx b/src/components/members/MemberContent/MemberInfo/index.tsx
index 9eaccab9..45fcc9e7 100644
--- a/src/components/members/MemberContent/MemberInfo/index.tsx
+++ b/src/components/members/MemberContent/MemberInfo/index.tsx
@@ -14,10 +14,12 @@ import MemberContactInfo from './MemberContactInfo';
 import MemberRegistrationTasks from './MemberRegistrationTasks';
 import MemberStatus from './MemberStatus';
 import AdminActions from './AdminActions';
+import { TfaaAuthUser } from '../../../layout';
 
 // Local Typings
 interface Props {
   authUserEmail: string | undefined;
+  currentAuthUser: TfaaAuthUser | null;
   currentMemberData: TfaaMemberData | null;
   isAdmin: boolean;
   onUpdateShouldRefetchUserList: ((shouldRefetchUserList: boolean) => void) | null;
@@ -60,6 +62,7 @@ const StyledRoot = styled.div(({ theme }) => ({
 // Component Definition
 const MemberInfo: React.FC<Props> = ({
   authUserEmail,
+  currentAuthUser,
   currentMemberData,
   onUpdateShouldRefetchUserList,
 }) => {
@@ -71,7 +74,10 @@ const MemberInfo: React.FC<Props> = ({
     <StyledRoot>
       <Motifs small />
 
-      <MemberStatus currentMemberData={currentMemberData} />
+      <MemberStatus
+        currentAuthUser={currentAuthUser}
+        currentMemberData={currentMemberData}
+      />
 
       {currentMemberData && (
         <MemberContactInfo
diff --git a/src/components/members/MemberContent/index.tsx b/src/components/members/MemberContent/index.tsx
index 86dc1551..72c2ff18 100644
--- a/src/components/members/MemberContent/index.tsx
+++ b/src/components/members/MemberContent/index.tsx
@@ -36,11 +36,10 @@ const MemberContent: React.FC<Props> = ({ currentAuthUser }) => {
   useEffect(() => {
     if (currentAuthUser && allMembersData && allMembersData.length > 0 && !currentMemberData) {
       const currentMember = allMembersData.find(
-        // We used to use authUser.uid as the unique key in the Firestore
-        // Now we use authUser.email
-        // We have to search for both for backwards compatibility
+        // We use a combination of email and uid to uniquely identify a user.
+        // The email part makes it easier to find a user in the database.
         (user) => {
-          return user.userId === currentAuthUser.uid || user.userId === currentAuthUser.email;
+          return user.userId === `${currentAuthUser.email}-${currentAuthUser.uid}`;
         });
 
       setCurrentMemberData(currentMember ?? null);
@@ -65,6 +64,7 @@ const MemberContent: React.FC<Props> = ({ currentAuthUser }) => {
 
       <MemberInfo
         authUserEmail={currentAuthUser?.email || currentMemberData?.Email}
+        currentAuthUser={currentAuthUser}
         currentMemberData={currentMemberData}
         isAdmin={isAdmin}
         onUpdateShouldRefetchUserList={handleUpdateShouldRefetchUserList}
diff --git a/src/components/register/SponsorRegisterContent.tsx b/src/components/register/SponsorRegisterContent.tsx
index beec6cb0..0efa9970 100644
--- a/src/components/register/SponsorRegisterContent.tsx
+++ b/src/components/register/SponsorRegisterContent.tsx
@@ -217,6 +217,8 @@ const SponsorRegisterContent: React.FC = () => {
 
   const hasCompletedAllSponsorSteps = completedSponsorSteps?.length >= 3;
 
+  const authenticatedUserId = `${currentAuthUser?.email}-${currentAuthUser?.uid}`;
+
   /* Children change depending on which step is active */
   return (
     <StyledRoot>
@@ -237,7 +239,7 @@ const SponsorRegisterContent: React.FC = () => {
         )}
         {activeStep === 1 && (
           <RegisterSponsorFormWrapper
-            authenticatedUserId={`${currentAuthUser?.email}-${currentAuthUser?.uid}`}
+            authenticatedUserId={authenticatedUserId}
             initialSponsorFormValues={INITIAL_SPONSOR_FORM_VALUES}
             onCompleteSponsorStep={handleCompleteSponsorStep}
             onUpdateSponsorForm={handleUpdateSponsorForm}
@@ -246,7 +248,7 @@ const SponsorRegisterContent: React.FC = () => {
         )}
         {[2, 3].includes(activeStep) && (
           <RegisterSponsorPayment
-            authenticatedUserId={currentAuthUser?.uid}
+            authenticatedUserId={authenticatedUserId}
             onUpdateSponsorForm={handleUpdateSponsorForm}
             sponsorForm={sponsorForm}
           />