diff --git a/src/components/create/form/TeamInfoForm.tsx b/src/components/create/form/TeamInfoForm.tsx
index a4e43fd..e707a55 100644
--- a/src/components/create/form/TeamInfoForm.tsx
+++ b/src/components/create/form/TeamInfoForm.tsx
@@ -2,10 +2,11 @@ import React from "react";
 import { Form, Row, Col, message, Input, Button, Typography, Alert } from "antd";
 import { PlusOutlined, DeleteOutlined } from "@ant-design/icons";
 import axios from "axios";
-import { apiUrl, Service } from "@hex-labs/core";
+import { apiUrl, Service, useAuth } from "@hex-labs/core";
 
 import { User } from "../../../types/User";
 import { FORM_LAYOUT, FORM_RULES, handleAxiosError } from "../../../util/util";
+import useAxios from "axios-hooks";
 
 const { Title, Text } = Typography;
 
@@ -17,6 +18,23 @@ interface Props {
 }
 
 const TeamInfoForm: React.FC<Props> = props => {
+  const theUser = useAuth();
+  const [{ data: hexathonsData, loading: hexathonsLoading, error: hexathonsError }] = useAxios(
+    apiUrl(Service.HEXATHONS, "/hexathons")
+  );
+
+  const activeHexathon = hexathonsData?.find((hexathon: any) => hexathon.isActive); // TODO: change to current hexathon context
+  // TODO: verify that isTeamBased is set to true 
+  const [{ data: teamsData, loading: teamsLoading, error: teamsError }] = useAxios(
+    {
+      url: apiUrl(Service.HEXATHONS, `/teams`),
+      params: {
+        hexathon: activeHexathon?.id,
+        userId: (theUser as any)?.user?.uid,
+      }
+    }
+  );
+
   const onFinish = async (values: any) => {
     const hide = message.loading("Loading...", 0);
     const newValues = {
@@ -39,14 +57,29 @@ const TeamInfoForm: React.FC<Props> = props => {
       });
   };
 
+
+
   const onFinishFailed = (errorInfo: any) => {
     message.error("Please complete the required fields.", 2);
   };
 
-  let formInitialValue = {};
+
+  if (teamsLoading) {
+    return <Text>Loading...</Text>;
+  }
+
+  let formInitialValue: { members?: { email: string }[] } = {};
 
   if (props.data.members) {
+    console.log("props.data", props.data);
     formInitialValue = props.data;
+  } else if (teamsData && teamsData.count > 0) {
+    const emails = teamsData.teams[0].members.map((member: any) => ({ email: member.email }));
+
+    const first = theUser?.user?.email;
+    // eslint-disable-next-line no-nested-ternary
+    emails.sort((a: any, b: any) => (a.email === first ? -1 : b.email === first ? 1 : 0));
+    formInitialValue = { members: emails };
   } else {
     formInitialValue = {
       members: [
@@ -72,7 +105,7 @@ const TeamInfoForm: React.FC<Props> = props => {
       <Title level={2}>Team Info</Title>
       <Text>
         Please list all the emails of all your team members below. Make sure the emails used are the
-        ones that they were accepted for through registration.
+        ones that they were accepted for through registration. Data is auto-populated based on match.hexlabs.org (if available).
       </Text>
       <Form
         name="team"