diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js
index 0e5fa20..43b11a1 100644
--- a/src/Components/Document/DocEditPage.js
+++ b/src/Components/Document/DocEditPage.js
@@ -47,7 +47,8 @@ const DocEditPage = () => {
   const [index, setIndex] = useState(0);
 
   // For document generation:
-  const state = group ? group?.state : null;
+
+  const state = group.state[0] ? group.state[0].code : "ny";
   const lawFirm = group ? group?.firm : null;
   const streetAdd = group ? group?.streetAddress : null;
   const city = group ? group.city : null;
@@ -61,15 +62,15 @@ const DocEditPage = () => {
       : process.env.REACT_APP_API_PROD;
 
   const displayCopy =
-    state === "New York"
+    state === "ny"
       ? docEditCopy.NewYork
-      : state === "New Jersey"
+      : state === "nj"
       ? docEditCopy.NewJersey
       : docEditCopy.NewYork;
 
   const headerPicker = () => {
     switch (state) {
-      case "New York":
+      case "ny":
         return (
           <NewYorkCaption
             displayCopy={displayCopy}
@@ -77,7 +78,7 @@ const DocEditPage = () => {
             onScrollClick={onScrollClick}
           />
         );
-      case "New Jersey":
+      case "nj":
         return (
           <NewJerseyCaption
             displayCopy={displayCopy}
@@ -85,7 +86,7 @@ const DocEditPage = () => {
             onScrollClick={onScrollClick}
           />
         );
-      case "Florida":
+      case "fl":
         return (
           <FloridaCaption
             displayCopy={displayCopy}
@@ -146,7 +147,8 @@ const DocEditPage = () => {
   /*
    *   GET parsed requests.
    *   GET completions if already generated
-   * */
+   */
+
   useEffect(() => {
     if (!documentId || !documentType) {
       return;
@@ -424,14 +426,14 @@ const DocEditPage = () => {
           defendant: defendants,
           firm: lawFirm,
           firmCity: city,
-          firmState: usState,
+          firmState: usState.code,
           firmStreetAddress: streetAdd,
           firmZip: zipCode,
           judge: judge,
           jurisdiction: juris,
           leadAttorneys: leadAttorneys,
           plaintiff: plaintiffs,
-          state: usState,
+          state: usState.code,
           tel: telephone,
           venue: venued,
         }),
diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index b503a43..ef68e26 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -33,8 +33,9 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const isEditing = typeof editCaseId !== "undefined";
   const [isBusy, setIsBusy] = useState(false);
   const [newCaseId, setNewCaseId] = useState();
-  const caseNumCopy =
-    group.state == "New York" ? "Index Number" : "Case Number";
+  const state = group?.state[0].code ? group?.state[0].code : null;
+  console.log("state", state);
+  const caseNumCopy = state === "ny" ? "Index Number" : "Case Number";
   const [data, setData] = useState(
     getFormDataDefaults(fields, isEditing ? caseData : undefined)
   );
@@ -185,9 +186,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
                 data.caseNumber.value.length === 0
                   ? isEditing
                     ? caseData.caseNumber
-                    : stateOfCase === "NY"
-                    ? "Index Number"
-                    : "Case Number"
+                    : caseNumCopy
                   : ""
               }
             />
diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js
index 8725408..264c14b 100644
--- a/src/Components/SignupPage/SignupPage.js
+++ b/src/Components/SignupPage/SignupPage.js
@@ -18,8 +18,10 @@ import {
   isFormDataHasErrors,
 } from "../../Utils/Form";
 import { objectMap } from "../../Utils/Object";
-import { determinePlan } from "../../Utils/Miscutils";
-import { signupFields } from "../../Constants/Fields/SignupFields";
+import {
+  signupFields,
+  stateDataValues,
+} from "../../Constants/Fields/SignupFields";
 import { paymentfields } from "../../Constants/Fields/PaymentFields";
 import { signupRadioFields } from "../../Constants/Fields/RadioFields";
 import PaymentModal from "../Modals/PaymentModal";
@@ -152,8 +154,15 @@ const SignupPage = () => {
     const fbAuthUid = authId;
     const plan = selectedPlan;
     const docsAllowed =
-      plan === "associate" ? 1 : plan === "partner" ? 3 : "unlimited";
+      plan === "associate"
+        ? 1
+        : plan === "partner"
+        ? 3
+        : plan === "unlimited"
+        ? 4000
+        : 0;
     const docsGenerated = 0;
+
     const {
       firstName,
       lastName,
@@ -168,6 +177,10 @@ const SignupPage = () => {
       email,
     } = dataValues;
 
+    const userState = stateDataValues.filter((value) => {
+      if (value.name === state) return value;
+    });
+
     const userData = {
       docsAllowed,
       docsGenerated,
@@ -180,7 +193,7 @@ const SignupPage = () => {
       telephone,
       streetAddress,
       city,
-      state,
+      state: userState,
       zipCode,
       barNumber,
       practiceArea,
diff --git a/src/Constants/Fields/SignupFields.js b/src/Constants/Fields/SignupFields.js
index 0c9d58d..84629ce 100644
--- a/src/Constants/Fields/SignupFields.js
+++ b/src/Constants/Fields/SignupFields.js
@@ -21,7 +21,7 @@ export const signupFields = {
     minLength: 3,
     maxLength: 45,
     type: "select",
-    values: ["Florida", "Massachusetts", "New Jersey", "New York"],
+    values: ["Florida", "New Jersey", "New York"],
   },
   zipCode: {
     required: true,
@@ -52,3 +52,9 @@ export const signupFields = {
     type: "confirmPassword",
   },
 };
+
+export const stateDataValues = [
+  { name: "Florida", value: "florida", code: "fl" },
+  { name: "New York", value: "newYork", code: "ny" },
+  { name: "New Jersey", value: "newJersey", code: "nj" },
+];