diff --git a/src/components/Proposal/Create/PluginForms/CreatePluginManagerProposal.tsx b/src/components/Proposal/Create/PluginForms/CreatePluginManagerProposal.tsx
index 9dbc10359..7f5907671 100644
--- a/src/components/Proposal/Create/PluginForms/CreatePluginManagerProposal.tsx
+++ b/src/components/Proposal/Create/PluginForms/CreatePluginManagerProposal.tsx
@@ -123,7 +123,6 @@ export interface IFormValues {
     memberReputation: number;
     fundingGoal: number;
     fundingGoalDeadline: number;
-    rageQuitEnable: boolean;
   };
   TokenTrade: {
     permissions: IPermissions;
@@ -244,7 +243,6 @@ const defaultValues: IFormValues = {
     memberReputation: 0,
     fundingGoal: 0,
     fundingGoalDeadline: 0,
-    rageQuitEnable: true,
   },
   SchemeRegistrar: {
     votingParamsRegister: { ...votingParams },
@@ -426,8 +424,32 @@ class CreatePluginManagerProposal extends React.Component<IProps, IState> {
             voteRemoveParamsHash: values.SchemeRegistrar.votingParamsRemove.voteParamsHash,
           };
           break;
+        case "Join":
+          proposalOptions.add.pluginInitParams = {
+            daoId: daoId,
+            votingMachine: votingMachine,
+            votingParams: gpFormValuesToVotingParams(values.Join.votingParams),
+            voteOnBehalf: values.Join.votingParams.voteOnBehalf,
+            voteParamsHash: values.Join.votingParams.voteParamsHash,
+            fundingToken: values.Join.fundingToken,
+            minFeeToJoin: values.Join.minFeeToJoin,
+            memberReputation: values.Join.memberReputation,
+            fundingGoal: values.Join.fundingGoal,
+            fundingGoalDeadline: values.Join.fundingGoalDeadline,
+          };
+          break;
+        case "FundingRequest":
+          proposalOptions.add.pluginInitParams = {
+            daoId: daoId,
+            votingMachine: votingMachine,
+            votingParams: gpFormValuesToVotingParams(values.FundingRequest.votingParams),
+            voteOnBehalf: values.FundingRequest.votingParams.voteOnBehalf,
+            voteParamsHash: values.FundingRequest.votingParams.voteParamsHash,
+            fundingToken: values.FundingRequest.fundingToken,
+          };
+          break;
         default:
-          throw Error(`Unimplemented Plugin Manager Plugin Type ${proposalOptions.add.pluginName}`);
+          throw Error(`Unimplemented Plugin Manager Plugin Type ${(proposalOptions.add as any).pluginName}`);
       }
 
       let permissions = 1;
diff --git a/src/components/Proposal/Create/PluginForms/PluginInitializeFields.tsx b/src/components/Proposal/Create/PluginForms/PluginInitializeFields.tsx
index 9a2993ed0..19a7d2b5b 100644
--- a/src/components/Proposal/Create/PluginForms/PluginInitializeFields.tsx
+++ b/src/components/Proposal/Create/PluginForms/PluginInitializeFields.tsx
@@ -125,19 +125,19 @@ const ContributionRewardExtFields = () => (
 
 const FundingRequest = () => (
   <div>
-    {fieldView("FundingRequest", "Funding Token", "fundingToken")}
+    {fieldView("FundingRequest", "Funding Token", "fundingToken", (address: string) => validators.address(address, true))}
     {GenesisProtocolFields("FundingRequest.votingParams")}
   </div>
 );
 
 const Join = () => (
   <div>
-    {fieldView("Join", "Funding Token", "fundingToken")}
-    {fieldView("Join", "Minimum Join Fee", "minFeeToJoin")}
-    {fieldView("Join", "Initial Reputation", "memberReputation")}
-    {fieldView("Join", "Funding Goal", "fundingGoal")}
-    {fieldView("Join", "Deadline", "fundingGoalDeadline")}
-    {fieldView("Join", "Allow Rage Quit", "rageQuitEnable")}
+    {fieldView("Join", "Funding Token", "fundingToken", (address: string) => validators.address(address, true))}
+    {fieldView("Join", "Minimum Join Fee", "minFeeToJoin", validators.validNumber)}
+    {fieldView("Join", "Initial Reputation", "memberReputation", validators.validNumber)}
+    {fieldView("Join", "Funding Goal", "fundingGoal", validators.validNumber)}
+    {fieldView("Join", "Deadline", "fundingGoalDeadline", validators.validNumber)}
+    {GenesisProtocolFields("Join.votingParams")}
   </div>
 );